diff options
6 files changed, 13 insertions, 8 deletions
diff --git a/packages/SystemUI/res/layout/quick_qs_status_icons.xml b/packages/SystemUI/res/layout/quick_qs_status_icons.xml index c03f25c75101..dcb8aaf2a6a8 100644 --- a/packages/SystemUI/res/layout/quick_qs_status_icons.xml +++ b/packages/SystemUI/res/layout/quick_qs_status_icons.xml @@ -20,8 +20,9 @@ android:layout_height="20dp" android:layout_marginTop="8dp" android:layout_marginBottom="14dp" + android:layout_marginEnd="@dimen/notification_side_paddings" android:layout_below="@id/quick_status_bar_system_icons" - android:paddingEnd="@dimen/signal_cluster_battery_padding" > + android:paddingEnd="@dimen/status_bar_padding_end" > <com.android.systemui.statusbar.phone.StatusIconContainer android:id="@+id/statusIcons" diff --git a/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml b/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml index 388b6333c719..7b9cd2aee862 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml @@ -20,15 +20,16 @@ android:id="@+id/quick_status_bar_system_icons" android:layout_width="match_parent" android:layout_height="@*android:dimen/quick_qs_offset_height" + android:layout_marginRight="@dimen/notification_side_paddings" + android:layout_marginLeft="@dimen/notification_side_paddings" android:layout_alignParentEnd="true" android:clipChildren="false" android:clipToPadding="false" android:gravity="center" - android:paddingStart="8dp" - android:paddingEnd="8dp" + android:paddingStart="@dimen/status_bar_padding_start" + android:paddingEnd="@dimen/status_bar_padding_end" android:orientation="horizontal"> - <com.android.systemui.statusbar.policy.Clock android:id="@+id/clock" android:layout_width="wrap_content" diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index f0138a6e2212..df46fabee903 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="@dimen/status_bar_padding_start" - android:paddingEnd="8dp" + android:paddingEnd="@dimen/status_bar_padding_end" android:orientation="horizontal" > <ViewStub diff --git a/packages/SystemUI/res/values-sw372dp/dimens.xml b/packages/SystemUI/res/values-sw372dp/dimens.xml index 3a7442a6ecd6..717f18f13632 100644 --- a/packages/SystemUI/res/values-sw372dp/dimens.xml +++ b/packages/SystemUI/res/values-sw372dp/dimens.xml @@ -18,5 +18,5 @@ <resources> <dimen name="nav_content_padding">8dp</dimen> <dimen name="rounded_corner_content_padding">8dp</dimen> - <dimen name="qs_header_tile_margin_horizontal">5dp</dimen> + <dimen name="qs_header_tile_margin_horizontal">13dp</dimen> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 9212c1454939..b99e35b5047d 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -185,6 +185,9 @@ <!-- the padding on the start of the statusbar --> <dimen name="status_bar_padding_start">6dp</dimen> + <!-- the padding on the end of the statusbar --> + <dimen name="status_bar_padding_end">8dp</dimen> + <!-- the radius of the overflow dot in the status bar --> <dimen name="overflow_dot_radius">1dp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index e2af90d6bbce..216fa78f1370 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -213,9 +213,9 @@ public class QuickStatusBarHeader extends RelativeLayout implements private int fillColorForIntensity(float intensity, Context context) { if (intensity == 0) { - return context.getColor(R.color.light_mode_icon_color_dual_tone_fill); + return context.getColor(R.color.light_mode_icon_color_single_tone); } - return context.getColor(R.color.dark_mode_icon_color_dual_tone_fill); + return context.getColor(R.color.dark_mode_icon_color_single_tone); } @Override |