diff options
author | Jorim Jaggi <jjaggi@google.com> | 2014-05-09 20:52:00 +0200 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2014-05-09 20:52:00 +0200 |
commit | 3084a2996f6797090cdf5310069db28de23cea64 (patch) | |
tree | 6c635ec114565dd7d12f1932f6521632ec677f0d /packages/SystemUI | |
parent | e1f788b3e216329c570929eb4526332ae0db14d1 (diff) | |
download | frameworks_base-3084a2996f6797090cdf5310069db28de23cea64.zip frameworks_base-3084a2996f6797090cdf5310069db28de23cea64.tar.gz frameworks_base-3084a2996f6797090cdf5310069db28de23cea64.tar.bz2 |
Revert "Fix measure performance of whole status bar window."
This reverts commit 5ef8eb5661f1b3c0723348f723778be247a2f365.
Diffstat (limited to 'packages/SystemUI')
7 files changed, 10 insertions, 18 deletions
diff --git a/packages/SystemUI/res/layout/heads_up.xml b/packages/SystemUI/res/layout/heads_up.xml index 7d9cfa1..e4954e7 100644 --- a/packages/SystemUI/res/layout/heads_up.xml +++ b/packages/SystemUI/res/layout/heads_up.xml @@ -20,7 +20,7 @@ <com.android.systemui.statusbar.policy.HeadsUpNotificationView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" - android:layout_width="match_parent" + android:layout_width="@dimen/notification_panel_width" android:id="@+id/content_holder" android:background="@drawable/notification_panel_bg" />
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 5b3f365..7308626 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -22,7 +22,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" android:id="@+id/notification_panel" - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="match_parent" > @@ -61,7 +61,7 @@ <com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer android:id="@+id/notification_container_parent" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:clipToPadding="false" android:clipChildren="false"> diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index c29da18..f9b022c 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -35,7 +35,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" > <include layout="@layout/status_bar_expanded" - style="@style/StatusBarExpanded" /> + android:layout_width="@dimen/notification_panel_width" + android:layout_height="match_parent" + android:layout_gravity="start|top" /> </com.android.systemui.statusbar.phone.PanelHolder> </com.android.systemui.statusbar.phone.StatusBarWindowView> diff --git a/packages/SystemUI/res/values-sw600dp/styles.xml b/packages/SystemUI/res/values-sw600dp/styles.xml index 1ea9442..b7becac 100644 --- a/packages/SystemUI/res/values-sw600dp/styles.xml +++ b/packages/SystemUI/res/values-sw600dp/styles.xml @@ -18,10 +18,4 @@ <style name="BrightnessDialogContainer" parent="@style/BaseBrightnessDialogContainer"> <item name="android:layout_width">480dp</item> </style> - - <style name="StatusBarExpanded"> - <item name="android:layout_width">@dimen/notification_panel_width</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">start|top</item> - </style> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index b6e6ee2..c6fdc16 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -196,6 +196,9 @@ <!-- Quick Settings CA Cert Warning tile geometry: gap between icon and text --> <dimen name="qs_cawarn_tile_margin_below_icon">3dp</dimen> + <!-- The width of the notification panel window: match_parent below sw600dp --> + <dimen name="notification_panel_width">-1dp</dimen> + <!-- used by DessertCase --> <dimen name="dessert_case_cell_size">192dp</dimen> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 6608c5d..8ab646d 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -171,10 +171,4 @@ <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault" /> - <style name="StatusBarExpanded"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_gravity">start|top</item> - </style> - </resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java index c2061f3..a4c9df5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java @@ -79,9 +79,8 @@ public class StatusBarWindowManager { | WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, PixelFormat.TRANSLUCENT); - mLp.width = ViewGroup.LayoutParams.MATCH_PARENT; mLp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; - mLp.gravity = Gravity.TOP; + mLp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; mLp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; mLp.setTitle("StatusBar"); mLp.packageName = mContext.getPackageName(); |