diff options
Diffstat (limited to 'packages/SystemUI')
4 files changed, 12 insertions, 12 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index ffcead0..7f6098a 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -29,6 +29,12 @@ android:layout_marginLeft="@dimen/notification_panel_margin_left" > + <View + android:id="@+id/handle" + android:layout_width="match_parent" + android:layout_height="@dimen/close_handle_height" + /> + <include layout="@layout/carrier_label" android:layout_height="@dimen/carrier_label_height" @@ -75,10 +81,4 @@ /> </ScrollView> </LinearLayout> - - <View - android:id="@+id/handle" - android:layout_width="match_parent" - android:layout_height="@dimen/close_handle_height" - /> </com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 58f749a..2b74f56 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -399,7 +399,7 @@ <string name="jelly_bean_dream_name">BeanFlinger</string> <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] --> - <string name="start_dreams">Start dreams</string> + <string name="start_dreams">Sleep Now</string> <!-- Textual description of Ethernet connections --> <string name="ethernet_label">Ethernet</string> diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java index a0f197d..5e0df49 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java @@ -165,19 +165,18 @@ public class RecentsVerticalScrollView extends ScrollView } setLayoutTransition(transitioner); - // Scroll to end after layout. - final ViewTreeObserver observer = getViewTreeObserver(); - + // Scroll to end after initial layout. final OnGlobalLayoutListener updateScroll = new OnGlobalLayoutListener() { public void onGlobalLayout() { mLastScrollPosition = scrollPositionOfMostRecent(); scrollTo(0, mLastScrollPosition); + final ViewTreeObserver observer = getViewTreeObserver(); if (observer.isAlive()) { observer.removeOnGlobalLayoutListener(this); } } }; - observer.addOnGlobalLayoutListener(updateScroll); + getViewTreeObserver().addOnGlobalLayoutListener(updateScroll); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index d63d517..c31e138 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -275,7 +275,8 @@ class QuickSettings { timeTile.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startSettingsActivity(android.provider.Settings.ACTION_DATE_SETTINGS); + // Quick. Clock. Quick. Clock. Quick. Clock. + startSettingsActivity(Intent.ACTION_QUICK_CLOCK); } }); mModel.addTimeTile(timeTile, new QuickSettingsModel.RefreshCallback() { |