diff options
106 files changed, 329 insertions, 174 deletions
diff --git a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java index 273f6fe..0280a0b 100644 --- a/core/java/com/android/internal/widget/SizeAdaptiveLayout.java +++ b/core/java/com/android/internal/widget/SizeAdaptiveLayout.java @@ -121,6 +121,12 @@ public class SizeAdaptiveLayout extends ViewGroup { mTransitionAnimation.addListener(mAnimatorListener); } + @Override + public void setLayoutDirection(int layoutDirection) { + super.setLayoutDirection(layoutDirection); + mModestyPanel.setLayoutDirection(layoutDirection); + } + /** * Visible for testing * @hide @@ -225,13 +231,11 @@ public class SizeAdaptiveLayout extends ViewGroup { if (unboundedView != null) { tallestView = unboundedView; } - if (heightMode == MeasureSpec.UNSPECIFIED) { - return tallestView; - } - if (heightSize > tallestViewSize) { + if (heightMode == MeasureSpec.UNSPECIFIED || heightSize > tallestViewSize) { return tallestView; + } else { + return smallestView; } - return smallestView; } @Override @@ -242,6 +246,7 @@ public class SizeAdaptiveLayout extends ViewGroup { View.MeasureSpec.EXACTLY); mActiveChild = selectActiveChild(measureSpec); mActiveChild.setVisibility(View.VISIBLE); + mActiveChild.setLayoutDirection(getLayoutDirection()); if (mLastActive != mActiveChild && mLastActive != null) { if (DEBUG) Log.d(TAG, this + " changed children from: " + mLastActive + @@ -272,10 +277,10 @@ public class SizeAdaptiveLayout extends ViewGroup { final int childWidth = mActiveChild.getMeasuredWidth(); final int childHeight = mActiveChild.getMeasuredHeight(); // TODO investigate setting LAYER_TYPE_HARDWARE on mLastActive - mActiveChild.layout(0, 0, 0 + childWidth, 0 + childHeight); + mActiveChild.layout(0, 0, childWidth, childHeight); if (DEBUG) Log.d(TAG, "got modesty offset of " + mModestyPanelTop); - mModestyPanel.layout(0, mModestyPanelTop, 0 + childWidth, mModestyPanelTop + childHeight); + mModestyPanel.layout(0, mModestyPanelTop, childWidth, mModestyPanelTop + childHeight); } @Override diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index cfe70dc..14fe6af 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -68,7 +68,8 @@ android:allowBackup="false" android:hardwareAccelerated="true" android:label="@string/app_label" - android:icon="@*android:drawable/platlogo"> + android:icon="@*android:drawable/platlogo" + android:supportsRtl="true"> <!-- Broadcast receiver that gets the broadcast at boot time and starts up everything else. diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notifications_normal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notifications_normal.png Binary files differnew file mode 100644 index 0000000..a937a7d --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notifications_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_normal.png Binary files differnew file mode 100644 index 0000000..b0cca26 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_pressed.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_pressed.png Binary files differnew file mode 100644 index 0000000..f9489bb --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_clear_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_normal.png Binary files differnew file mode 100644 index 0000000..d26aab0 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_pressed.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_pressed.png Binary files differnew file mode 100644 index 0000000..c02c794 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_open_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_normal.png Binary files differnew file mode 100644 index 0000000..fb8c108 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_pressed.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_pressed.png Binary files differnew file mode 100644 index 0000000..293debc --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_notify_quicksettings_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png Binary files differnew file mode 100644 index 0000000..1403416 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_on.png Binary files differnew file mode 100644 index 0000000..c35c34d --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_on.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_default_user.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_default_user.png Binary files differnew file mode 100644 index 0000000..28df7e82 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_default_user.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png Binary files differnew file mode 100644 index 0000000..782ebfe --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png Binary files differnew file mode 100644 index 0000000..efca67e --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_recent.png Binary files differnew file mode 100644 index 0000000..677b471 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_recent_land.png Binary files differnew file mode 100644 index 0000000..478b9ca --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_flightmode.png Binary files differnew file mode 100644 index 0000000..44d1afb --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_signal_flightmode.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notifications_normal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notifications_normal.png Binary files differnew file mode 100644 index 0000000..78c4a5f --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notifications_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_normal.png Binary files differnew file mode 100644 index 0000000..a9dbc93 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_pressed.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_pressed.png Binary files differnew file mode 100644 index 0000000..5bba00f --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_clear_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_normal.png Binary files differnew file mode 100644 index 0000000..b38ddd6 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_pressed.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_pressed.png Binary files differnew file mode 100644 index 0000000..032ce42 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_open_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_normal.png Binary files differnew file mode 100644 index 0000000..d815761 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_pressed.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_pressed.png Binary files differnew file mode 100644 index 0000000..369bb61 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_notify_quicksettings_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png Binary files differnew file mode 100644 index 0000000..6587c2d --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_on.png Binary files differnew file mode 100644 index 0000000..833b7f0 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_on.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_default_user.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_default_user.png Binary files differnew file mode 100644 index 0000000..16743ef --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_default_user.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png Binary files differnew file mode 100644 index 0000000..a1b8062 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png Binary files differnew file mode 100644 index 0000000..23318ae --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_recent.png Binary files differnew file mode 100644 index 0000000..fcdbefe --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_recent_land.png Binary files differnew file mode 100644 index 0000000..7f0cc51 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_flightmode.png Binary files differnew file mode 100644 index 0000000..9070357 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_signal_flightmode.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png Binary files differnew file mode 100644 index 0000000..194a843 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png Binary files differnew file mode 100644 index 0000000..ed08779 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_recent.png Binary files differnew file mode 100644 index 0000000..542a93b --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_recent_land.png Binary files differnew file mode 100644 index 0000000..e96f340 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png Binary files differnew file mode 100644 index 0000000..a345a4e --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png Binary files differnew file mode 100644 index 0000000..96ea0c9 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_recent.png Binary files differnew file mode 100644 index 0000000..70dc8af --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_recent_land.png Binary files differnew file mode 100644 index 0000000..db4d907 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png Binary files differnew file mode 100644 index 0000000..9f9afd4 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png Binary files differnew file mode 100644 index 0000000..cc376c4 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_recent.png Binary files differnew file mode 100644 index 0000000..ea4a8ca --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_recent_land.png Binary files differnew file mode 100644 index 0000000..73ef87b --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notifications_normal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notifications_normal.png Binary files differnew file mode 100644 index 0000000..a2787eb --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notifications_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_normal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_normal.png Binary files differnew file mode 100644 index 0000000..53a74c9 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_pressed.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_pressed.png Binary files differnew file mode 100644 index 0000000..c9d50c0 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_clear_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_normal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_normal.png Binary files differnew file mode 100644 index 0000000..57faad8 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_pressed.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_pressed.png Binary files differnew file mode 100644 index 0000000..c736dcd --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_open_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_normal.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_normal.png Binary files differnew file mode 100644 index 0000000..c8ff8a6 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_normal.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_pressed.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_pressed.png Binary files differnew file mode 100644 index 0000000..3add352 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_notify_quicksettings_pressed.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png Binary files differnew file mode 100644 index 0000000..d16e3d3 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_on.png Binary files differnew file mode 100644 index 0000000..53523f6 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_on.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_default_user.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_default_user.png Binary files differnew file mode 100644 index 0000000..73db61d --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_default_user.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png Binary files differnew file mode 100644 index 0000000..633d864 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png Binary files differnew file mode 100644 index 0000000..7b9613c --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_recent.png Binary files differnew file mode 100644 index 0000000..4665e2a --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_recent_land.png Binary files differnew file mode 100644 index 0000000..6d33a6e --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_flightmode.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_flightmode.png Binary files differnew file mode 100644 index 0000000..9ede64c --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_signal_flightmode.png diff --git a/packages/SystemUI/res/layout-land/status_bar_help.xml b/packages/SystemUI/res/layout-land/status_bar_help.xml index 5a635ae..83b9829 100644 --- a/packages/SystemUI/res/layout-land/status_bar_help.xml +++ b/packages/SystemUI/res/layout-land/status_bar_help.xml @@ -27,7 +27,7 @@ android:background="#DD000000" android:focusable="true" android:orientation="horizontal" - android:gravity="top|left" + android:gravity="top|start" > <ImageView diff --git a/packages/SystemUI/res/layout-land/status_bar_recent_item.xml b/packages/SystemUI/res/layout-land/status_bar_recent_item.xml index 10e313e..47d628b 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_item.xml @@ -38,10 +38,10 @@ <FrameLayout android:id="@+id/app_thumbnail" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:layout_marginTop="@dimen/status_bar_recents_thumbnail_top_margin" - android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" + android:layout_marginStart="@dimen/status_bar_recents_thumbnail_left_margin" android:background="@drawable/recents_thumbnail_bg" android:foreground="@drawable/recents_thumbnail_fg" android:visibility="invisible"> @@ -55,8 +55,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" - android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" - android:layout_alignParentLeft="true" + android:layout_marginStart="@dimen/status_bar_recents_app_icon_left_margin" + android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" @@ -75,7 +75,7 @@ android:layout_alignLeft="@id/app_thumbnail" android:layout_below="@id/app_thumbnail" android:layout_marginTop="@dimen/status_bar_recents_text_description_padding" - android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" + android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" android:singleLine="true" android:ellipsize="marquee" android:textColor="@color/status_bar_recents_app_label_color" @@ -89,7 +89,7 @@ android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:scrollHorizontally="true" - android:layout_alignLeft="@id/app_thumbnail" + android:layout_alignStart="@id/app_thumbnail" android:layout_below="@id/app_label" android:layout_marginTop="@dimen/status_bar_recents_text_description_padding" android:singleLine="true" diff --git a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml index 8fdde92..e2d9d6e 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml @@ -40,7 +40,7 @@ android:layout_height="match_parent" android:fadingEdge="horizontal" android:scrollbars="none" - android:layout_gravity="right" + android:layout_gravity="end" android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length"> <LinearLayout android:id="@+id/recents_linear_layout" diff --git a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml index f56b03b..96b0a1f 100644 --- a/packages/SystemUI/res/layout-land/status_bar_search_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_search_panel.xml @@ -44,7 +44,7 @@ android:layout_width="@dimen/navbar_search_panel_height" android:layout_height="match_parent" android:layout_alignParentBottom="true" - android:gravity="left" + android:gravity="start" prvandroid:targetDrawables="@array/navbar_search_targets" prvandroid:targetDescriptions="@array/navbar_search_target_descriptions" diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml index b1104cc..0bac993 100644 --- a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml @@ -45,7 +45,7 @@ android:layout_width="48dp" android:layout_height="match_parent" android:layout_weight="0" - android:layout_marginLeft="2dp" + android:layout_marginStart="2dp" android:visibility="invisible" /> <Space @@ -89,7 +89,7 @@ android:layout_width="48dp" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_menu" - android:layout_marginRight="2dp" + android:layout_marginEnd="2dp" systemui:keyCode="82" android:layout_weight="0" android:visibility="invisible" @@ -114,7 +114,7 @@ <ImageView android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp" android:layout_height="match_parent" - android:layout_marginLeft="40dp" + android:layout_marginStart="40dp" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" android:layout_weight="0" @@ -128,7 +128,7 @@ /> <ImageView android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp" - android:layout_marginRight="40dp" + android:layout_marginEnd="40dp" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" @@ -186,7 +186,7 @@ android:layout_width="48dp" android:layout_height="match_parent" android:layout_weight="0" - android:layout_marginLeft="2dp" + android:layout_marginStart="2dp" android:visibility="invisible" /> <Space @@ -229,7 +229,7 @@ <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" android:layout_width="48dp" android:layout_height="match_parent" - android:layout_marginRight="2dp" + android:layout_marginEnd="2dp" android:src="@drawable/ic_sysbar_menu" systemui:keyCode="82" android:layout_weight="0" @@ -255,7 +255,7 @@ <ImageView android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp" android:layout_height="match_parent" - android:layout_marginLeft="40dp" + android:layout_marginStart="40dp" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" android:layout_weight="0" @@ -269,7 +269,7 @@ /> <ImageView android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp" - android:layout_marginRight="40dp" + android:layout_marginEnd="40dp" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" diff --git a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml index b68632a..0947c6f 100644 --- a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml @@ -41,12 +41,12 @@ <include layout="@layout/status_bar_expanded" android:layout_width="@dimen/notification_panel_width" android:layout_height="wrap_content" - android:layout_gravity="left|top" + android:layout_gravity="start|top" /> <include layout="@layout/quick_settings" android:layout_width="@dimen/notification_panel_width" android:layout_height="wrap_content" - android:layout_gravity="right|top" + android:layout_gravity="end|top" /> </com.android.systemui.statusbar.phone.PanelHolder> </com.android.systemui.statusbar.phone.StatusBarWindowView> diff --git a/packages/SystemUI/res/layout/battery_low.xml b/packages/SystemUI/res/layout/battery_low.xml index 3061743..2373355 100644 --- a/packages/SystemUI/res/layout/battery_low.xml +++ b/packages/SystemUI/res/layout/battery_low.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:textSize="18sp" android:textColor="#ffffffff" - android:gravity="left" + android:gravity="start" android:text="@string/battery_low_subtitle" /> @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:textSize="18sp" android:textColor="#ffffffff" - android:gravity="left" + android:gravity="start" android:paddingBottom="16dp" /> diff --git a/packages/SystemUI/res/layout/compat_mode_help.xml b/packages/SystemUI/res/layout/compat_mode_help.xml index a354336..c2ed78e 100644 --- a/packages/SystemUI/res/layout/compat_mode_help.xml +++ b/packages/SystemUI/res/layout/compat_mode_help.xml @@ -27,9 +27,9 @@ android:id="@+id/header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="80dp" + android:layout_marginStart="80dp" android:layout_marginTop="80dp" - android:layout_marginRight="80dp" + android:layout_marginEnd="80dp" android:textSize="60sp" android:maxLines="1" android:shadowRadius="8" @@ -51,7 +51,7 @@ android:layout_height="190dp" android:background="@drawable/compat_mode_help_divider_bottom" android:layout_marginBottom="55dp" - android:layout_marginRight="80dp" + android:layout_marginEnd="80dp" android:layout_alignLeft="@id/header" android:layout_alignParentBottom="true" > @@ -59,7 +59,7 @@ android:id="@+id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:src="@drawable/compat_mode_help_icon" android:contentDescription="@string/accessibility_compatibility_zoom_button" @@ -69,9 +69,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@id/icon" - android:layout_marginRight="10dp" + android:layout_alignParentStart="true" + android:layout_toStartOf="@id/icon" + android:layout_marginEnd="10dp" android:shadowRadius="4" android:shadowColor="#FF000000" android:textSize="28sp" diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index da52d89..09923a7 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -111,7 +111,7 @@ <ImageView android:layout_width="80dp" android:layout_height="match_parent" - android:layout_marginLeft="40dp" + android:layout_marginStart="40dp" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" android:layout_weight="0" @@ -137,7 +137,7 @@ /> <ImageView android:layout_width="80dp" - android:layout_marginRight="40dp" + android:layout_marginEnd="40dp" android:layout_height="match_parent" android:src="@drawable/ic_sysbar_lights_out_dot_small" android:scaleType="center" diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index 66c64c4..aab5083 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -28,13 +28,13 @@ android:id="@+id/wifi_combo" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_marginRight="-6dp" + android:layout_marginEnd="-6dp" > <ImageView android:id="@+id/wifi_signal" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:scaleType="center" /> @@ -55,13 +55,13 @@ android:id="@+id/wimax_combo" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_marginRight="-6dp" + android:layout_marginEnd="-6dp" > <ImageView android:id="@+id/wimax_signal" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:scaleType="center" /> @@ -101,7 +101,7 @@ android:id="@+id/mobile_inout" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_gravity="right|bottom" + android:layout_gravity="end|bottom" /> </FrameLayout> </FrameLayout> diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index bf20e9d..8805175 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -66,7 +66,7 @@ <com.android.systemui.statusbar.phone.IconMerger android:id="@+id/notificationIcons" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:gravity="center_vertical" android:orientation="horizontal"/> </LinearLayout> @@ -110,7 +110,7 @@ android:layout_height="match_parent" android:singleLine="true" android:paddingLeft="6dip" - android:gravity="center_vertical|left" + android:gravity="center_vertical|start" /> </LinearLayout> </LinearLayout> @@ -124,7 +124,7 @@ <ImageSwitcher android:id="@+id/tickerIcon" android:layout_width="@dimen/status_bar_icon_size" android:layout_height="@dimen/status_bar_icon_size" - android:layout_marginRight="4dip" + android:layout_marginEnd="4dip" > <com.android.systemui.statusbar.AnimatedImageView android:layout_width="@dimen/status_bar_icon_size" diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index b71025e..1693e01 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:background="@drawable/notification_panel_bg" android:paddingTop="@dimen/notification_panel_padding_top" - android:layout_marginLeft="@dimen/notification_panel_margin_left" + android:layout_marginStart="@dimen/notification_panel_margin_left" > <View diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 556210e..54c63f8 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -39,7 +39,7 @@ android:id="@+id/clock" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dp" + android:layout_marginEnd="8dp" android:singleLine="true" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock" android:layout_centerVertical="true" @@ -50,7 +50,7 @@ android:layout_height="wrap_content" android:singleLine="true" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date" - android:layout_toRightOf="@id/clock" + android:layout_toEndOf="@id/clock" android:layout_alignBaseline="@id/clock" /> </RelativeLayout> @@ -86,7 +86,7 @@ <FrameLayout android:id="@+id/settings_button_holder" android:layout_width="50dp" android:layout_height="50dp" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" > <ImageView android:id="@+id/settings_button" android:layout_width="50dp" diff --git a/packages/SystemUI/res/layout/status_bar_help.xml b/packages/SystemUI/res/layout/status_bar_help.xml index 41bde4b..3c004ee 100644 --- a/packages/SystemUI/res/layout/status_bar_help.xml +++ b/packages/SystemUI/res/layout/status_bar_help.xml @@ -27,7 +27,7 @@ android:background="#DD000000" android:focusable="true" android:orientation="vertical" - android:gravity="top|left" + android:gravity="top|start" > <ImageView diff --git a/packages/SystemUI/res/layout/status_bar_icon.xml b/packages/SystemUI/res/layout/status_bar_icon.xml index d2ebf9e..063212e 100644 --- a/packages/SystemUI/res/layout/status_bar_icon.xml +++ b/packages/SystemUI/res/layout/status_bar_icon.xml @@ -33,8 +33,8 @@ <TextView android:id="@+id/number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right|bottom" - android:layout_marginRight="1dp" + android:layout_gravity="end|bottom" + android:layout_marginEnd="1dp" android:layout_marginBottom="1dp" android:textSize="10sp" android:textColor="#ffffffff" diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml index 3dcdae8..2a93a2b 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_row.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml @@ -17,8 +17,8 @@ android:id="@+id/veto" android:layout_width="48dp" android:layout_height="match_parent" - android:gravity="right" - android:layout_marginRight="-80dp" + android:gravity="end" + android:layout_marginEnd="-80dp" android:background="@null" android:paddingRight="8dp" android:paddingLeft="8dp" @@ -54,7 +54,7 @@ android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:fontFamily="sans-serif-condensed" android:textSize="9dp" android:textStyle="bold" diff --git a/packages/SystemUI/res/layout/status_bar_recent_item.xml b/packages/SystemUI/res/layout/status_bar_recent_item.xml index e2b5723..7ce3a09 100644 --- a/packages/SystemUI/res/layout/status_bar_recent_item.xml +++ b/packages/SystemUI/res/layout/status_bar_recent_item.xml @@ -40,10 +40,10 @@ android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:scrollHorizontally="true" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignTop="@+id/app_icon" android:paddingTop="2dp" - android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" + android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" android:singleLine="true" android:ellipsize="marquee" android:textColor="@color/status_bar_recents_app_label_color" @@ -53,8 +53,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_toRightOf="@id/app_label" - android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" + android:layout_toEndOf="@id/app_label" + android:layout_marginStart="@dimen/status_bar_recents_thumbnail_left_margin" android:background="@drawable/recents_thumbnail_bg" android:foreground="@drawable/recents_thumbnail_fg" android:visibility="invisible"> @@ -66,11 +66,11 @@ <View android:id="@+id/recents_callout_line" android:layout_width="@dimen/status_bar_recents_app_label_width" android:layout_height="1dip" - android:layout_alignParentLeft="true" - android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" - android:layout_toLeftOf="@id/app_thumbnail" + android:layout_alignParentStart="true" + android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" + android:layout_toStartOf="@id/app_thumbnail" android:layout_below="@id/app_label" - android:layout_marginRight="3dip" + android:layout_marginEnd="3dip" android:layout_marginTop="3dip" android:background="@drawable/recents_callout_line" /> @@ -78,8 +78,8 @@ <ImageView android:id="@id/app_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/app_label" - android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" + android:layout_toEndOf="@id/app_label" + android:layout_marginStart="@dimen/status_bar_recents_app_icon_left_margin" android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" @@ -95,8 +95,8 @@ android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:scrollHorizontally="true" - android:layout_alignParentLeft="true" - android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" + android:layout_alignParentStart="true" + android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" android:layout_below="@id/recents_callout_line" android:layout_marginTop="3dip" android:singleLine="true" diff --git a/packages/SystemUI/res/layout/status_bar_recent_panel.xml b/packages/SystemUI/res/layout/status_bar_recent_panel.xml index 7335f86..4bbe277 100644 --- a/packages/SystemUI/res/layout/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout/status_bar_recent_panel.xml @@ -37,13 +37,13 @@ android:id="@+id/recents_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="0dp" + android:layout_marginEnd="0dp" android:divider="@null" android:stackFromBottom="true" android:fadingEdge="vertical" android:scrollbars="none" android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length" - android:layout_gravity="bottom|left" + android:layout_gravity="bottom|start" android:clipToPadding="false" android:clipChildren="false"> diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml index 3105dab..e3cd704 100644 --- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml +++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml @@ -24,7 +24,7 @@ android:id="@+id/toggle" android:layout_width="48dp" android:layout_height="0dp" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:layout_alignParentBottom="true" android:button="@null" @@ -33,9 +33,9 @@ android:id="@+id/slider" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_toRightOf="@id/toggle" + android:layout_toEndOf="@id/toggle" android:layout_centerVertical="true" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:paddingLeft="20dp" android:paddingRight="20dp" /> diff --git a/packages/SystemUI/res/layout/system_bar.xml b/packages/SystemUI/res/layout/system_bar.xml index c13b113..ac62702 100644 --- a/packages/SystemUI/res/layout/system_bar.xml +++ b/packages/SystemUI/res/layout/system_bar.xml @@ -39,7 +39,7 @@ <include layout="@layout/system_bar_notification_area" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_marginTop="1dp" /> @@ -48,7 +48,7 @@ android:id="@+id/navigationArea" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:orientation="horizontal" android:clipChildren="false" android:clipToPadding="false" @@ -93,8 +93,8 @@ android:layout_width="0dp" android:paddingLeft="8dip" android:paddingRight="8dip" - android:layout_toRightOf="@+id/navigationArea" - android:layout_toLeftOf="@+id/notificationArea" + android:layout_toEndOf="@+id/navigationArea" + android:layout_toStartOf="@+id/notificationArea" android:visibility="gone" /> </RelativeLayout> @@ -119,7 +119,7 @@ android:layout_width="80dip" android:layout_height="48dip" android:src="@drawable/ic_sysbar_lights_out_dot_small" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true" /> <ImageView @@ -127,7 +127,7 @@ android:layout_width="80dip" android:layout_height="48dip" android:src="@drawable/ic_sysbar_lights_out_dot_large" - android:layout_toRightOf="@+id/dot0" + android:layout_toEndOf="@+id/dot0" android:layout_alignParentBottom="true" /> <ImageView @@ -135,7 +135,7 @@ android:layout_width="80dip" android:layout_height="48dip" android:src="@drawable/ic_sysbar_lights_out_dot_small" - android:layout_toRightOf="@+id/dot1" + android:layout_toEndOf="@+id/dot1" android:layout_alignParentBottom="true" /> <ImageView @@ -143,7 +143,7 @@ android:layout_width="80dip" android:layout_height="48dip" android:src="@drawable/ic_sysbar_lights_out_dot_small" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" /> </RelativeLayout> diff --git a/packages/SystemUI/res/layout/system_bar_input_methods_item.xml b/packages/SystemUI/res/layout/system_bar_input_methods_item.xml index 5515559..710406c 100644 --- a/packages/SystemUI/res/layout/system_bar_input_methods_item.xml +++ b/packages/SystemUI/res/layout/system_bar_input_methods_item.xml @@ -71,7 +71,7 @@ <TextView android:id="@+id/item_subtitle" android:layout_marginTop="-4dip" - android:layout_gravity="center_vertical|left" + android:layout_gravity="center_vertical|start" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" /> @@ -87,7 +87,7 @@ android:id="@+id/item_settings_icon" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginLeft="5dip" + android:layout_marginStart="5dip" android:layout_gravity="center_vertical" android:paddingRight="10dip" android:paddingLeft="10dip" diff --git a/packages/SystemUI/res/layout/system_bar_input_methods_panel.xml b/packages/SystemUI/res/layout/system_bar_input_methods_panel.xml index 8dede50..ecc4f1e 100644 --- a/packages/SystemUI/res/layout/system_bar_input_methods_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_input_methods_panel.xml @@ -36,7 +36,7 @@ <LinearLayout android:layout_width="450dip" android:layout_height="wrap_content" - android:layout_marginLeft="20dip" + android:layout_marginStart="20dip" android:orientation="vertical" android:background="@drawable/notify_panel_clock_bg"> <!-- Hard keyboard switch --> @@ -71,7 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginRight="16dip" /> + android:layout_marginEnd="16dip" /> </LinearLayout> <View android:layout_width="match_parent" diff --git a/packages/SystemUI/res/layout/system_bar_no_recent_apps.xml b/packages/SystemUI/res/layout/system_bar_no_recent_apps.xml index bc89281..c023ef7 100644 --- a/packages/SystemUI/res/layout/system_bar_no_recent_apps.xml +++ b/packages/SystemUI/res/layout/system_bar_no_recent_apps.xml @@ -30,7 +30,7 @@ android:textSize="20dp" android:textColor="@android:color/holo_blue_light" android:text="@string/status_bar_no_recent_apps" - android:gravity="left" - android:layout_gravity="bottom|left" + android:gravity="start" + android:layout_gravity="bottom|start" /> </FrameLayout> diff --git a/packages/SystemUI/res/layout/system_bar_notification_area.xml b/packages/SystemUI/res/layout/system_bar_notification_area.xml index a59dad2..51ffda7 100644 --- a/packages/SystemUI/res/layout/system_bar_notification_area.xml +++ b/packages/SystemUI/res/layout/system_bar_notification_area.xml @@ -22,7 +22,7 @@ android:id="@+id/notificationArea" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:orientation="horizontal" android:background="?android:attr/listChoiceBackgroundIndicator" android:clickable="true" @@ -39,7 +39,7 @@ android:id="@+id/imeSwitchButton" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginLeft="8dip" + android:layout_marginStart="8dip" android:src="@drawable/ic_sysbar_ime_default" android:visibility="gone" android:contentDescription="@string/accessibility_ime_switch_button" @@ -49,7 +49,7 @@ android:id="@+id/compatModeButton" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginLeft="8dip" + android:layout_marginStart="8dip" android:src="@drawable/ic_sysbar_zoom" android:visibility="gone" android:contentDescription="@string/accessibility_compatibility_zoom_button" @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" android:alpha="0.4" /> </com.android.systemui.statusbar.tablet.NotificationIconArea> @@ -85,16 +85,16 @@ android:layout_height="match_parent" android:singleLine="true" android:paddingLeft="6dip" - android:layout_marginRight="8dip" - android:gravity="center_vertical|left" + android:layout_marginEnd="8dip" + android:gravity="center_vertical|start" /> <TextView android:id="@+id/network_text" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginRight="6dip" - android:layout_marginLeft="6dip" + android:layout_marginEnd="6dip" + android:layout_marginStart="6dip" android:gravity="center" android:singleLine="true" android:visibility="gone" @@ -106,7 +106,7 @@ android:id="@+id/signal_battery_cluster" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginRight="16dp" + android:layout_marginEnd="16dp" android:orientation="horizontal" android:gravity="center" > diff --git a/packages/SystemUI/res/layout/system_bar_notification_panel.xml b/packages/SystemUI/res/layout/system_bar_notification_panel.xml index 315639e..58a6de3 100644 --- a/packages/SystemUI/res/layout/system_bar_notification_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_notification_panel.xml @@ -21,7 +21,7 @@ android:id="@+id/content_parent" android:layout_height="match_parent" android:layout_width="match_parent" - android:gravity="right" + android:gravity="end" > <!-- lift the panel up off the status bar while leaving a touchable are --> @@ -29,7 +29,7 @@ android:id="@+id/system_bar_notification_panel_bottom_space" android:layout_height="56dp" android:layout_width="478dp" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" /> @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_width="478dp" android:orientation="vertical" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_above="@id/system_bar_notification_panel_bottom_space" android:paddingBottom="8dp" > @@ -48,7 +48,7 @@ android:layout_width="match_parent" android:layout_height="130dp" android:layout_above="@id/content_frame" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_weight="0" /> diff --git a/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml b/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml index 59544f4..97f774a 100644 --- a/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml +++ b/packages/SystemUI/res/layout/system_bar_notification_panel_title.xml @@ -32,7 +32,7 @@ android:id="@+id/icons" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" @@ -86,7 +86,7 @@ <TextView android:id="@+id/mobile_text" style="@style/SystemBarNotificationText" - android:layout_gravity="left|center_vertical" + android:layout_gravity="start|center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="12dp" @@ -122,7 +122,7 @@ <TextView android:id="@+id/wifi_text" style="@style/SystemBarNotificationText" - android:layout_gravity="left|center_vertical" + android:layout_gravity="start|center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="12dp" @@ -147,7 +147,7 @@ style="@style/SystemBarNotificationText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left|center_vertical" + android:layout_gravity="start|center_vertical" android:paddingRight="2dp" android:singleLine="true" android:text="@string/status_bar_settings_settings_button" @@ -209,8 +209,8 @@ android:id="@+id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" android:textAppearance="@style/TextAppearance.SystemBar.Expanded.Date" /> diff --git a/packages/SystemUI/res/layout/system_bar_recent_item.xml b/packages/SystemUI/res/layout/system_bar_recent_item.xml index b5f7da7..34f60b2 100644 --- a/packages/SystemUI/res/layout/system_bar_recent_item.xml +++ b/packages/SystemUI/res/layout/system_bar_recent_item.xml @@ -30,9 +30,9 @@ android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:scrollHorizontally="true" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentTop="true" - android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" + android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" android:layout_marginTop="32dip" android:singleLine="true" android:ellipsize="marquee" @@ -43,8 +43,8 @@ <FrameLayout android:id="@+id/app_thumbnail" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/app_label" - android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin" + android:layout_toEndOf="@id/app_label" + android:layout_marginStart="@dimen/status_bar_recents_thumbnail_left_margin" android:scaleType="center" android:background="@drawable/recents_thumbnail_bg" android:foreground="@drawable/recents_thumbnail_fg" @@ -59,8 +59,8 @@ <ImageView android:id="@+id/app_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/app_label" - android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin" + android:layout_toEndOf="@id/app_label" + android:layout_marginStart="@dimen/status_bar_recents_app_icon_left_margin" android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin" android:maxWidth="@dimen/status_bar_recents_app_icon_max_width" android:maxHeight="@dimen/status_bar_recents_app_icon_max_height" @@ -75,10 +75,10 @@ android:layout_height="1dip" android:layout_below="@id/app_label" android:layout_marginTop="3dip" - android:layout_alignParentLeft="true" - android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" - android:layout_toLeftOf="@id/app_thumbnail" - android:layout_marginRight="3dip" + android:layout_alignParentStart="true" + android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" + android:layout_toStartOf="@id/app_thumbnail" + android:layout_marginEnd="3dip" android:background="@drawable/recents_callout_line" /> @@ -89,9 +89,9 @@ android:fadingEdge="horizontal" android:fadingEdgeLength="@dimen/status_bar_recents_text_fading_edge_length" android:scrollHorizontally="true" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_below="@id/recents_callout_line" - android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin" + android:layout_marginStart="@dimen/status_bar_recents_app_label_left_margin" android:layout_marginTop="3dip" android:singleLine="true" android:ellipsize="marquee" diff --git a/packages/SystemUI/res/layout/system_bar_recent_panel.xml b/packages/SystemUI/res/layout/system_bar_recent_panel.xml index 3951bba..aed8a8c 100644 --- a/packages/SystemUI/res/layout/system_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_recent_panel.xml @@ -41,13 +41,13 @@ <com.android.systemui.recent.RecentsVerticalScrollView android:id="@+id/recents_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/status_bar_recents_right_glow_margin" + android:layout_marginEnd="@dimen/status_bar_recents_right_glow_margin" android:divider="@null" android:stackFromBottom="true" android:fadingEdge="vertical" android:scrollbars="none" android:fadingEdgeLength="20dip" - android:layout_gravity="bottom|left" + android:layout_gravity="bottom|start" android:clipToPadding="false" android:clipChildren="false"> @@ -65,7 +65,7 @@ android:id="@+id/recents_no_apps" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="58dip" + android:layout_marginStart="58dip" android:layout_marginBottom="36dip" android:visibility="invisible" /> @@ -76,7 +76,7 @@ android:layout_width="match_parent" android:layout_height="@*android:dimen/system_bar_height" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> diff --git a/packages/SystemUI/res/layout/system_bar_settings_view.xml b/packages/SystemUI/res/layout/system_bar_settings_view.xml index d07e45d..3e959d5 100644 --- a/packages/SystemUI/res/layout/system_bar_settings_view.xml +++ b/packages/SystemUI/res/layout/system_bar_settings_view.xml @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginRight="5dp" + android:layout_marginEnd="5dp" /> </LinearLayout> <View style="@style/SystemBarPanelSettingsPanelSeparator" /> @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginRight="5dp" + android:layout_marginEnd="5dp" /> </LinearLayout> <View @@ -105,7 +105,7 @@ android:layout_width="0dp" android:layout_height="fill_parent" android:layout_weight="1" - android:layout_marginRight="2dp" + android:layout_marginEnd="2dp" systemui:text="@string/status_bar_settings_auto_brightness_label" /> </LinearLayout> @@ -130,7 +130,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginRight="5dp" + android:layout_marginEnd="5dp" /> </LinearLayout> <View style="@style/SystemBarPanelSettingsPanelSeparator" /> diff --git a/packages/SystemUI/res/layout/system_bar_ticker_compat.xml b/packages/SystemUI/res/layout/system_bar_ticker_compat.xml index 0d255e7..14cdc40 100644 --- a/packages/SystemUI/res/layout/system_bar_ticker_compat.xml +++ b/packages/SystemUI/res/layout/system_bar_ticker_compat.xml @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_vertical" - android:layout_marginLeft="12dp" + android:layout_marginStart="12dp" android:gravity="center_vertical" android:maxLines="2" /> diff --git a/packages/SystemUI/res/layout/system_bar_ticker_panel.xml b/packages/SystemUI/res/layout/system_bar_ticker_panel.xml index 1738b48..49d0405 100644 --- a/packages/SystemUI/res/layout/system_bar_ticker_panel.xml +++ b/packages/SystemUI/res/layout/system_bar_ticker_panel.xml @@ -25,7 +25,7 @@ android:layout_height="@*android:dimen/system_bar_height" android:layout_width="match_parent" android:background="@drawable/system_bar_ticker_background" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true" android:clickable="false" /> @@ -36,7 +36,7 @@ android:layout_height="@android:dimen/notification_large_icon_width" android:scaleType="center" android:visibility="gone" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true" /> @@ -45,7 +45,7 @@ android:layout_weight="1" android:layout_height="@*android:dimen/system_bar_height" android:layout_width="match_parent" - android:layout_toRightOf="@id/large_icon" + android:layout_toEndOf="@id/large_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" /> diff --git a/packages/SystemUI/res/layout/universe.xml b/packages/SystemUI/res/layout/universe.xml index 6102d2e..390c467 100644 --- a/packages/SystemUI/res/layout/universe.xml +++ b/packages/SystemUI/res/layout/universe.xml @@ -22,7 +22,7 @@ <Button android:id="@+id/close" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" android:layout_alignParentRight="true" + android:layout_alignParentTop="true" android:layout_alignParentEnd="true" android:text="@string/close_universe" /> <TextView android:id="@+id/title" diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index fc80f5c..ad4dcf9 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -24,9 +24,9 @@ <dimen name="notification_panel_margin_left">16dp</dimen> <!-- Gravity for the notification & quick settings panels --> - <!-- 0x33 = left|top ; 0x35 = right|top --> - <integer name="notification_panel_layout_gravity">0x33</integer> - <integer name="settings_panel_layout_gravity">0x35</integer> + <!-- 0x800033 = start|top ; 0x800035 = end|top --> + <integer name="notification_panel_layout_gravity">0x800033</integer> + <integer name="settings_panel_layout_gravity">0x800035</integer> <!-- Diameter of outer shape drawable shown in navbar search--> <dimen name="navbar_search_outerring_diameter">430dip</dimen> diff --git a/packages/SystemUI/res/values-sw720dp/styles.xml b/packages/SystemUI/res/values-sw720dp/styles.xml index e0b1774..5009395 100644 --- a/packages/SystemUI/res/values-sw720dp/styles.xml +++ b/packages/SystemUI/res/values-sw720dp/styles.xml @@ -39,13 +39,13 @@ <item name="android:layout_height">wrap_content</item> <item name="android:layout_width">0dp</item> <item name="android:layout_weight">1</item> - <item name="android:layout_gravity">left|center_vertical</item> + <item name="android:layout_gravity">start|center_vertical</item> <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textSize">18sp</item> </style> <style name="SystemBarPanelSettingsPanelSeparator"> - <item name="android:layout_marginRight">0dp</item> + <item name="android:layout_marginEnd">0dp</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">1dp</item> <item name="android:background">@android:drawable/divider_horizontal_dark</item> diff --git a/packages/SystemUI/src/com/android/systemui/LoadAverageService.java b/packages/SystemUI/src/com/android/systemui/LoadAverageService.java index 67dc3cd..2b45ad1 100644 --- a/packages/SystemUI/src/com/android/systemui/LoadAverageService.java +++ b/packages/SystemUI/src/com/android/systemui/LoadAverageService.java @@ -293,7 +293,7 @@ public class LoadAverageService extends Service { WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, PixelFormat.TRANSLUCENT); - params.gravity = Gravity.RIGHT | Gravity.TOP; + params.gravity = Gravity.END | Gravity.TOP; params.setTitle("Load Average"); WindowManager wm = (WindowManager)getSystemService(WINDOW_SERVICE); wm.addView(mView, params); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index fe33b02..3bac146 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar; +import android.content.res.Configuration; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarIconList; @@ -44,7 +45,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.res.Configuration; import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.Bitmap; @@ -80,6 +80,7 @@ import android.widget.RemoteViews; import android.widget.TextView; import java.util.ArrayList; +import java.util.Locale; public abstract class BaseStatusBar extends SystemUI implements CommandQueue.Callbacks { @@ -124,6 +125,9 @@ public abstract class BaseStatusBar extends SystemUI implements protected int mCurrentUserId = 0; + protected int mLayoutDirection; + private Locale mLocale; + // UI-specific methods /** @@ -134,6 +138,8 @@ public abstract class BaseStatusBar extends SystemUI implements protected WindowManager mWindowManager; protected IWindowManager mWindowManagerService; + protected abstract void refreshLayout(int layoutDirection); + protected Display mDisplay; private boolean mDeviceProvisioned = false; @@ -203,6 +209,9 @@ public abstract class BaseStatusBar extends SystemUI implements mBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); + mLocale = mContext.getResources().getConfiguration().locale; + mLayoutDirection = TextUtils.getLayoutDirectionFromLocale(mLocale); + // Connect in to the status bar manager service StatusBarIconList iconList = new StatusBarIconList(); ArrayList<IBinder> notificationKeys = new ArrayList<IBinder>(); @@ -274,6 +283,8 @@ public abstract class BaseStatusBar extends SystemUI implements userSwitched(mCurrentUserId); } }}, filter); + + mLocale = mContext.getResources().getConfiguration().locale; } public void userSwitched(int newUserId) { @@ -291,6 +302,16 @@ public abstract class BaseStatusBar extends SystemUI implements || thisUserId == notificationUserId; } + @Override + protected void onConfigurationChanged(Configuration newConfig) { + final Locale newLocale = mContext.getResources().getConfiguration().locale; + if (! newLocale.equals(mLocale)) { + mLocale = newLocale; + mLayoutDirection = TextUtils.getLayoutDirectionFromLocale(mLocale); + refreshLayout(mLayoutDirection); + } + } + protected View updateNotificationVetoButton(View row, StatusBarNotification n) { View vetoButton = row.findViewById(R.id.veto); if (n.isClearable()) { @@ -426,7 +447,6 @@ public abstract class BaseStatusBar extends SystemUI implements protected abstract WindowManager.LayoutParams getSearchLayoutParams( LayoutParams layoutParams); - protected void updateSearchPanel() { // Search Panel boolean visible = false; @@ -442,6 +462,7 @@ public abstract class BaseStatusBar extends SystemUI implements mSearchPanelView.setOnTouchListener( new TouchOutsideListener(MSG_CLOSE_SEARCH_PANEL, mSearchPanelView)); mSearchPanelView.setVisibility(View.GONE); + mSearchPanelView.setLayoutDirection(mLayoutDirection); WindowManager.LayoutParams lp = getSearchLayoutParams(mSearchPanelView.getLayoutParams()); @@ -714,6 +735,7 @@ public abstract class BaseStatusBar extends SystemUI implements LayoutInflater inflater = (LayoutInflater)mContext.getSystemService( Context.LAYOUT_INFLATER_SERVICE); View row = inflater.inflate(R.layout.status_bar_notification_row, parent, false); + row.setLayoutDirection(mLayoutDirection); // for blaming (see SwipeHelper.setLongPressListener) row.setTag(sbn.pkg); @@ -761,6 +783,7 @@ public abstract class BaseStatusBar extends SystemUI implements params.minHeight = minHeight; params.maxHeight = minHeight; adaptive.addView(expandedOneU, params); + expandedOneU.setLayoutDirection(mLayoutDirection); } if (expandedLarge != null) { SizeAdaptiveLayout.LayoutParams params = @@ -768,6 +791,7 @@ public abstract class BaseStatusBar extends SystemUI implements params.minHeight = minHeight+1; params.maxHeight = maxHeight; adaptive.addView(expandedLarge, params); + expandedLarge.setLayoutDirection(mLayoutDirection); } row.setDrawingCacheEnabled(true); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 1321ade..6424a71 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -172,8 +172,9 @@ public class SignalClusterView } if (mIsAirplaneMode) { - mAirplane.setVisibility(View.VISIBLE); + mAirplane.setImageDrawable(null); mAirplane.setImageResource(mAirplaneIconId); + mAirplane.setVisibility(View.VISIBLE); } else { mAirplane.setVisibility(View.GONE); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 5eeef93..28c4113 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -74,6 +74,7 @@ public class NavigationBarView extends LinearLayout { int mNavigationIconHints = 0; private Drawable mBackIcon, mBackLandIcon, mBackAltIcon, mBackAltLandIcon; + private Drawable mRecentIcon; private DelegateViewHelper mDelegateHelper; private DeadZone mDeadZone; @@ -169,10 +170,22 @@ public class NavigationBarView extends LinearLayout { mShowMenu = false; mDelegateHelper = new DelegateViewHelper(this); + getIcons(res); + } + + private void getIcons(Resources res) { mBackIcon = res.getDrawable(R.drawable.ic_sysbar_back); mBackLandIcon = res.getDrawable(R.drawable.ic_sysbar_back_land); mBackAltIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime); mBackAltLandIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime); + mRecentIcon = res.getDrawable(R.drawable.ic_sysbar_recent); + } + + @Override + public void setLayoutDirection(int layoutDirection) { + getIcons(mContext.getResources()); + + super.setLayoutDirection(layoutDirection); } public void notifyScreenOn(boolean screenOn) { @@ -225,6 +238,8 @@ public class NavigationBarView extends LinearLayout { ? (mVertical ? mBackAltLandIcon : mBackAltIcon) : (mVertical ? mBackLandIcon : mBackIcon)); + ((ImageView)getRecentsButton()).setImageDrawable(mRecentIcon); + setDisabledFlags(mDisabledFlags, true); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 30af333..fea1a05 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -356,6 +356,7 @@ public class PhoneStatusBar extends BaseStatusBar { } return mStatusBarWindow.onTouchEvent(event); }}); + mStatusBarWindow.setLayoutDirection(mLayoutDirection); mStatusBarView = (PhoneStatusBarView) mStatusBarWindow.findViewById(R.id.status_bar); mStatusBarView.setBar(this); @@ -387,6 +388,7 @@ public class PhoneStatusBar extends BaseStatusBar { mIntruderAlertView = (IntruderAlertView) View.inflate(context, R.layout.intruder_alert, null); mIntruderAlertView.setVisibility(View.GONE); mIntruderAlertView.setBar(this); + mIntruderAlertView.setLayoutDirection(mLayoutDirection); } if (MULTIUSER_DEBUG) { mNotificationPanelDebugText = (TextView) mNotificationPanel.findViewById(R.id.header_debug_info); @@ -404,6 +406,7 @@ public class PhoneStatusBar extends BaseStatusBar { mNavigationBarView.setDisabledFlags(mDisabled); mNavigationBarView.setBar(this); + mNavigationBarView.setLayoutDirection(mLayoutDirection); } } catch (RemoteException ex) { // no window manager? good luck with that @@ -639,7 +642,7 @@ public class PhoneStatusBar extends BaseStatusBar { lp.flags |= WindowManager.LayoutParams.FLAG_DIM_BEHIND; lp.dimAmount = 0.75f; } - lp.gravity = Gravity.BOTTOM | Gravity.LEFT; + lp.gravity = Gravity.BOTTOM | Gravity.START; lp.setTitle("RecentsPanel"); lp.windowAnimations = com.android.internal.R.style.Animation_RecentApplications; lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED @@ -661,7 +664,7 @@ public class PhoneStatusBar extends BaseStatusBar { if (ActivityManager.isHighEndGfx()) { lp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; } - lp.gravity = Gravity.BOTTOM | Gravity.LEFT; + lp.gravity = Gravity.BOTTOM | Gravity.START; lp.setTitle("SearchPanel"); // TODO: Define custom animation for Search panel lp.windowAnimations = com.android.internal.R.style.Animation_RecentApplications; @@ -951,6 +954,36 @@ public class PhoneStatusBar extends BaseStatusBar { setAreThereNotifications(); } + @Override + protected void refreshLayout(int layoutDirection) { + mStatusBarWindow.setLayoutDirection(layoutDirection); + if (ENABLE_INTRUDERS) { + mIntruderAlertView.setLayoutDirection(layoutDirection); + } + + if (mNavigationBarView != null) { + mNavigationBarView.setLayoutDirection(layoutDirection); + } + + if (mClearButton != null && mClearButton instanceof ImageView) { + // Force asset reloading + ((ImageView)mClearButton).setImageDrawable(null); + ((ImageView)mClearButton).setImageResource(R.drawable.ic_notify_clear); + } + + if (mSettingsButton != null) { + // Force asset reloading + mSettingsButton.setImageDrawable(null); + mSettingsButton.setImageResource(R.drawable.ic_notify_quicksettings); + } + + if (mNotificationButton != null) { + // Force asset reloading + mNotificationButton.setImageDrawable(null); + mNotificationButton.setImageResource(R.drawable.ic_notifications); + } + } + private void updateShowSearchHoldoff() { mShowSearchHoldoff = mContext.getResources().getInteger( R.integer.config_show_search_delay); @@ -988,6 +1021,7 @@ public class PhoneStatusBar extends BaseStatusBar { View v = toShow.get(i); if (v.getParent() == null) { mPile.addView(v, i); + v.setLayoutDirection(mLayoutDirection); } } @@ -2121,13 +2155,13 @@ public class PhoneStatusBar extends BaseStatusBar { FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) mNotificationPanel.getLayoutParams(); lp.gravity = mNotificationPanelGravity; - lp.leftMargin = mNotificationPanelMarginPx; + lp.setMarginStart(mNotificationPanelMarginPx); mNotificationPanel.setLayoutParams(lp); if (mSettingsPanel != null) { lp = (FrameLayout.LayoutParams) mSettingsPanel.getLayoutParams(); lp.gravity = mSettingsPanelGravity; - lp.rightMargin = mNotificationPanelMarginPx; + lp.setMarginEnd(mNotificationPanelMarginPx); mSettingsPanel.setLayoutParams(lp); } @@ -2192,7 +2226,8 @@ public class PhoneStatusBar extends BaseStatusBar { View sampleView = snapshot.get(0); int width = sampleView.getWidth(); - final int velocity = width * 8; // 1000/8 = 125 ms duration + final int dir = sampleView.isLayoutRtl() ? -1 : +1; + final int velocity = dir * width * 8; // 1000/8 = 125 ms duration for (final View _v : snapshot) { mHandler.postDelayed(new Runnable() { @Override @@ -2394,11 +2429,12 @@ public class PhoneStatusBar extends BaseStatusBar { = (int) res.getDimension(R.dimen.notification_panel_margin_left); mNotificationPanelGravity = res.getInteger(R.integer.notification_panel_layout_gravity); if (mNotificationPanelGravity <= 0) { - mNotificationPanelGravity = Gravity.LEFT | Gravity.TOP; + mNotificationPanelGravity = Gravity.START | Gravity.TOP; } mSettingsPanelGravity = res.getInteger(R.integer.settings_panel_layout_gravity); + Log.d(TAG, "mSettingsPanelGravity = " + mSettingsPanelGravity); if (mSettingsPanelGravity <= 0) { - mSettingsPanelGravity = Gravity.RIGHT | Gravity.TOP; + mSettingsPanelGravity = Gravity.END | Gravity.TOP; } mCarrierLabelHeight = res.getDimensionPixelSize(R.dimen.carrier_label_height); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index af6a149..571544b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -106,6 +106,7 @@ public class PhoneStatusBarView extends PanelBar { @Override public PanelView selectPanelForTouch(MotionEvent touch) { final float x = touch.getX(); + final boolean isLayoutRtl = isLayoutRtl(); if (mFullWidthNotifications) { // No double swiping. If either panel is open, nothing else can be pulled down. @@ -130,7 +131,8 @@ public class PhoneStatusBarView extends PanelBar { if (region < mSettingsPanelDragzoneMin) region = mSettingsPanelDragzoneMin; - return (w - x < region) ? mSettingsPanel : mNotificationPanel; + final boolean showSettings = isLayoutRtl ? (x < region) : (w - region < x); + return showSettings ? mSettingsPanel : mNotificationPanel; } @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 9b0a320..a6500a2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -113,6 +113,7 @@ class QuickSettings { private LevelListDrawable mChargingBatteryLevels; boolean mTilesSetUp = false; + boolean mUseDefaultAvatar = false; private Handler mHandler; @@ -155,6 +156,7 @@ class QuickSettings { filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED); filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); filter.addAction(Intent.ACTION_USER_SWITCHED); + filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); mContext.registerReceiver(mReceiver, filter); IntentFilter profileFilter = new IntentFilter(); @@ -228,6 +230,7 @@ class QuickSettings { avatar = new BitmapDrawable(mContext.getResources(), rawAvatar); } else { avatar = mContext.getResources().getDrawable(R.drawable.ic_qs_default_user); + mUseDefaultAvatar = true; } // If it's a single-user device, get the profile name, since the nickname is not @@ -916,6 +919,10 @@ class QuickSettings { applyBluetoothStatus(); } else if (Intent.ACTION_USER_SWITCHED.equals(action)) { reloadUserInfo(); + } else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) { + if (mUseDefaultAvatar) { + queryForUserInformation(); + } } } }; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java index 4e8339e..17ee017 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java @@ -68,7 +68,7 @@ class QuickSettingsContainerView extends FrameLayout { float cellWidth = (float) Math.ceil(((float) availableWidth) / mNumColumns); // Update each of the children's widths accordingly to the cell width - int N = getChildCount(); + final int N = getChildCount(); int cellHeight = 0; int cursor = 0; for (int i = 0; i < N; ++i) { @@ -102,36 +102,50 @@ class QuickSettingsContainerView extends FrameLayout { @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - int N = getChildCount(); - int x = getPaddingLeft(); + final int N = getChildCount(); + final boolean isLayoutRtl = isLayoutRtl(); + final int width = getWidth(); + + int x = getPaddingStart(); int y = getPaddingTop(); int cursor = 0; + for (int i = 0; i < N; ++i) { - QuickSettingsTileView v = (QuickSettingsTileView) getChildAt(i); - ViewGroup.LayoutParams lp = (ViewGroup.LayoutParams) v.getLayoutParams(); - if (v.getVisibility() != GONE) { - int col = cursor % mNumColumns; - int colSpan = v.getColumnSpan(); + QuickSettingsTileView child = (QuickSettingsTileView) getChildAt(i); + ViewGroup.LayoutParams lp = child.getLayoutParams(); + if (child.getVisibility() != GONE) { + final int col = cursor % mNumColumns; + final int colSpan = child.getColumnSpan(); + + final int childWidth = lp.width; + final int childHeight = lp.height; + int row = (int) (cursor / mNumColumns); // Push the item to the next row if it can't fit on this one if ((col + colSpan) > mNumColumns) { - x = getPaddingLeft(); - y += lp.height + mCellGap; + x = getPaddingStart(); + y += childHeight + mCellGap; row++; } + final int childLeft = (isLayoutRtl) ? width - x - childWidth : x; + final int childRight = childLeft + childWidth; + + final int childTop = y; + final int childBottom = childTop + childHeight; + // Layout the container - v.layout(x, y, x + lp.width, y + lp.height); + child.layout(childLeft, childTop, childRight, childBottom); // Offset the position by the cell gap or reset the position and cursor when we // reach the end of the row - cursor += v.getColumnSpan(); + cursor += child.getColumnSpan(); if (cursor < (((row + 1) * mNumColumns))) { - x += lp.width + mCellGap; + x += childWidth + mCellGap; } else { - x = getPaddingLeft(); - y += lp.height + mCellGap; + x = getPaddingStart(); + y += childHeight + mCellGap; } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index bbb90c8..cda3675 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -54,6 +54,7 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import java.util.Locale; public class NetworkController extends BroadcastReceiver { // debug @@ -133,6 +134,9 @@ public class NetworkController extends BroadcastReceiver { private boolean mAirplaneMode = false; private boolean mLastAirplaneMode = true; + private Locale mLocale = null; + private Locale mLastLocale = null; + // our ui Context mContext; ArrayList<ImageView> mPhoneSignalIconViews = new ArrayList<ImageView>(); @@ -251,6 +255,8 @@ public class NetworkController extends BroadcastReceiver { // yuck mBatteryStats = BatteryStatsService.getService(); + + mLastLocale = mContext.getResources().getConfiguration().locale; } public boolean hasMobileDataFeature() { @@ -398,8 +404,10 @@ public class NetworkController extends BroadcastReceiver { updateConnectivity(intent); refreshViews(); } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) { + refreshLocale(); refreshViews(); } else if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) { + refreshLocale(); updateAirplaneMode(); refreshViews(); } else if (action.equals(WimaxManagerConstants.NET_4G_STATE_CHANGED_ACTION) || @@ -521,6 +529,10 @@ public class NetworkController extends BroadcastReceiver { Settings.Global.AIRPLANE_MODE_ON, 0) == 1); } + private void refreshLocale() { + mLocale = mContext.getResources().getConfiguration().locale; + } + private final void updateTelephonySignalStrength() { if (!hasService()) { if (CHATTY) Slog.d(TAG, "updateTelephonySignalStrength: !hasService()"); @@ -1188,7 +1200,8 @@ public class NetworkController extends BroadcastReceiver { || mLastWifiIconId != mWifiIconId || mLastWimaxIconId != mWimaxIconId || mLastDataTypeIconId != mDataTypeIconId - || mLastAirplaneMode != mAirplaneMode) + || mLastAirplaneMode != mAirplaneMode + || mLastLocale != mLocale) { // NB: the mLast*s will be updated later for (SignalCluster cluster : mSignalClusters) { @@ -1203,6 +1216,10 @@ public class NetworkController extends BroadcastReceiver { mLastAirplaneMode = mAirplaneMode; } + if (mLastLocale != mLocale) { + mLastLocale = mLocale; + } + // the phone icon on phones if (mLastPhoneSignalIconId != mPhoneSignalIconId) { mLastPhoneSignalIconId = mPhoneSignalIconId; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java index b431287..87fc6fc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java @@ -34,6 +34,7 @@ import android.view.ViewTreeObserver; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; +import android.widget.ImageView; import android.widget.RelativeLayout; import com.android.systemui.ExpandHelper; @@ -54,8 +55,8 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, boolean mHasClearableNotifications = false; int mNotificationCount = 0; NotificationPanelTitle mTitleArea; - View mSettingsButton; - View mNotificationButton; + ImageView mSettingsButton; + ImageView mNotificationButton; View mNotificationScroller; ViewGroup mContentFrame; Rect mContentArea = new Rect(); @@ -94,8 +95,8 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, mTitleArea = (NotificationPanelTitle) findViewById(R.id.title_area); mTitleArea.setPanel(this); - mSettingsButton = findViewById(R.id.settings_button); - mNotificationButton = findViewById(R.id.notification_button); + mSettingsButton = (ImageView) findViewById(R.id.settings_button); + mNotificationButton = (ImageView) findViewById(R.id.notification_button); mNotificationScroller = findViewById(R.id.notification_scroller); mContentFrame = (ViewGroup)findViewById(R.id.content_frame); @@ -449,5 +450,15 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, mSettingsButton.setVisibility(settingsEnabled ? View.VISIBLE : View.GONE); } } + + public void refreshLayout(int layoutDirection) { + // Force asset reloading + mSettingsButton.setImageDrawable(null); + mSettingsButton.setImageResource(R.drawable.ic_notify_settings); + + // Force asset reloading + mNotificationButton.setImageDrawable(null); + mNotificationButton.setImageResource(R.drawable.ic_notifications); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 86c247a..ccd87f7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -247,6 +247,7 @@ public class TabletStatusBar extends BaseStatusBar implements mNotificationPanel.show(false, false); mNotificationPanel.setOnTouchListener( new TouchOutsideListener(MSG_CLOSE_NOTIFICATION_PANEL, mNotificationPanel)); + mNotificationPanel.setLayoutDirection(mLayoutDirection); // the battery icon mBatteryController.addIconView((ImageView)mNotificationPanel.findViewById(R.id.battery)); @@ -291,7 +292,7 @@ public class TabletStatusBar extends BaseStatusBar implements | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, PixelFormat.TRANSLUCENT); - lp.gravity = Gravity.BOTTOM | Gravity.RIGHT; + lp.gravity = Gravity.BOTTOM | Gravity.END; lp.setTitle("NotificationPanel"); lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING; @@ -312,6 +313,7 @@ public class TabletStatusBar extends BaseStatusBar implements mInputMethodsPanel.setOnTouchListener(new TouchOutsideListener( MSG_CLOSE_INPUT_METHODS_PANEL, mInputMethodsPanel)); mInputMethodsPanel.setImeSwitchButton(mInputMethodSwitchButton); + mInputMethodsPanel.setLayoutDirection(mLayoutDirection); mStatusBarView.setIgnoreChildren(2, mInputMethodSwitchButton, mInputMethodsPanel); lp = new WindowManager.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, @@ -322,7 +324,7 @@ public class TabletStatusBar extends BaseStatusBar implements | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, PixelFormat.TRANSLUCENT); - lp.gravity = Gravity.BOTTOM | Gravity.RIGHT; + lp.gravity = Gravity.BOTTOM | Gravity.END; lp.setTitle("InputMethodsPanel"); lp.windowAnimations = R.style.Animation_RecentPanel; @@ -335,6 +337,7 @@ public class TabletStatusBar extends BaseStatusBar implements MSG_CLOSE_COMPAT_MODE_PANEL, mCompatModePanel)); mCompatModePanel.setTrigger(mCompatModeButton); mCompatModePanel.setVisibility(View.GONE); + mCompatModePanel.setLayoutDirection(mLayoutDirection); mStatusBarView.setIgnoreChildren(3, mCompatModeButton, mCompatModePanel); lp = new WindowManager.LayoutParams( 250, @@ -345,7 +348,7 @@ public class TabletStatusBar extends BaseStatusBar implements | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, PixelFormat.TRANSLUCENT); - lp.gravity = Gravity.BOTTOM | Gravity.RIGHT; + lp.gravity = Gravity.BOTTOM | Gravity.END; lp.setTitle("CompatModePanel"); lp.windowAnimations = android.R.style.Animation_Dialog; @@ -381,6 +384,7 @@ public class TabletStatusBar extends BaseStatusBar implements @Override protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); loadDimens(); mNotificationPanelParams.height = getNotificationPanelHeight(); mWindowManager.updateViewLayout(mNotificationPanel, mNotificationPanelParams); @@ -389,6 +393,17 @@ public class TabletStatusBar extends BaseStatusBar implements updateSearchPanel(); } + @Override + protected void refreshLayout(int layoutDirection) { + mStatusBarView.setLayoutDirection(layoutDirection); + if (mCompatibilityHelpDialog != null) { + mCompatibilityHelpDialog.setLayoutDirection(layoutDirection); + } + mNotificationPanel.refreshLayout(layoutDirection); + mInputMethodsPanel.setLayoutDirection(layoutDirection); + mCompatModePanel.setLayoutDirection(layoutDirection); + } + protected void loadDimens() { final Resources res = mContext.getResources(); @@ -448,6 +463,7 @@ public class TabletStatusBar extends BaseStatusBar implements final TabletStatusBarView sb = (TabletStatusBarView)View.inflate( context, R.layout.system_bar, null); mStatusBarView = sb; + mStatusBarView.setLayoutDirection(mLayoutDirection); sb.setHandler(mHandler); @@ -612,7 +628,7 @@ public class TabletStatusBar extends BaseStatusBar implements | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, PixelFormat.TRANSLUCENT); - lp.gravity = Gravity.BOTTOM | Gravity.LEFT; + lp.gravity = Gravity.BOTTOM | Gravity.START; lp.setTitle("RecentsPanel"); lp.windowAnimations = com.android.internal.R.style.Animation_RecentApplications; lp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED @@ -638,7 +654,7 @@ public class TabletStatusBar extends BaseStatusBar implements lp.flags |= WindowManager.LayoutParams.FLAG_DIM_BEHIND; lp.dimAmount = 0.7f; } - lp.gravity = Gravity.BOTTOM | Gravity.LEFT; + lp.gravity = Gravity.BOTTOM | Gravity.START; lp.setTitle("SearchPanel"); // TODO: Define custom animation for Search panel lp.windowAnimations = com.android.internal.R.style.Animation_RecentApplications; @@ -1118,6 +1134,7 @@ public class TabletStatusBar extends BaseStatusBar implements } mCompatibilityHelpDialog = View.inflate(mContext, R.layout.compat_mode_help, null); + mCompatibilityHelpDialog.setLayoutDirection(mLayoutDirection); View button = mCompatibilityHelpDialog.findViewById(R.id.button); button.setOnClickListener(new View.OnClickListener() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java index ea97941..0859874 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java @@ -226,7 +226,7 @@ public class TabletTicker WindowManager.LayoutParams lp = new WindowManager.LayoutParams(width, mLargeIconHeight, WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL, windowFlags, PixelFormat.TRANSLUCENT); - lp.gravity = Gravity.BOTTOM | Gravity.RIGHT; + lp.gravity = Gravity.BOTTOM | Gravity.END; // lp.windowAnimations = com.android.internal.R.style.Animation_Toast; mLayoutTransition = new LayoutTransition(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java index 519d3c1..413cc78 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java @@ -145,4 +145,9 @@ public class TvStatusBar extends BaseStatusBar { @Override public void animateExpandSettingsPanel() { } + + @Override + protected void refreshLayout(int layoutDirection) { + } + } |