Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I6358cfe3,I00b20bd7 into pi-dev

Browse Source 
* changes:
  Fix status icon tint in QQS.
  Fix QQS side padding for icons and tiles.
This commit is contained in:
TreeHugger Robot
2018-04-12 14:55:55 +00:00
committed by Android (Google) Code Review
parent 8e7f23a74c 9cac338ac2
commit ef85bbfe4d
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/quick_qs_status_icons.xml
View File

@@ -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"

7
packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml
View File

@@ -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"

2
packages/SystemUI/res/layout/status_bar.xml
View File

@@ -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

2
packages/SystemUI/res/values-sw372dp/dimens.xml
View File

@@ -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>

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -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>

4
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -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