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

resolve merge conflicts of 3b7bac537d to master

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8233ff863d207d669a32034d49e02036987def95
This commit is contained in:
Jason Monk
2017-07-05 13:25:20 -04:00
parent f34c6d9cc1 3b7bac537d
commit 520d2fc1e9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,8 @@
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:orientation="horizontal">

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

@@ -196,7 +196,7 @@
<dimen name="status_bar_header_padding_bottom">48dp</dimen>
<!-- The height of the container that holds the system icons in the quick settings header. -->
<dimen name="qs_header_system_icons_area_height">32dp</dimen>
<dimen name="qs_header_system_icons_area_height">40dp</dimen>
<!-- The height of the container that holds the system icons in the quick settings header in the
car setting. -->