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

Merge "QQS visual fixes." into pi-dev

Browse Source 
am: 032ab15256

Change-Id: I01e06e8895c969b3f62601a7ee8ac0dc95ee1e3d
This commit is contained in:
Amin Shaikh
2018-04-26 07:36:41 -07:00
committed by android-build-merger
parent 9c2330ea96 032ab15256
commit eeedbb5adf
6 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,13 +18,15 @@
xmlns:systemui="http://schemas.android.com/apk/res-auto" xmlns:systemui="http://schemas.android.com/apk/res-auto"
android:id="@+id/quick_qs_status_icons" android:id="@+id/quick_qs_status_icons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="14dp" android:layout_marginBottom="14dp"
android:layout_marginStart="8dp" android:layout_marginStart="@dimen/status_bar_padding_start"
android:layout_marginEnd="@dimen/notification_side_paddings" android:layout_marginEnd="@dimen/status_bar_padding_end"
android:layout_below="@id/quick_status_bar_system_icons" android:layout_below="@id/quick_status_bar_system_icons"
android:paddingEnd="@dimen/status_bar_padding_end" > android:clipChildren="false"
android:clipToPadding="false"
android:minHeight="20dp" >
<com.android.systemui.statusbar.policy.DateView <com.android.systemui.statusbar.policy.DateView
android:id="@+id/date" android:id="@+id/date"

15
packages/SystemUI/res/layout/quick_settings_header_info.xml
View File

@@ -45,14 +45,16 @@
android:layout_width="@dimen/qs_header_alarm_icon_size" android:layout_width="@dimen/qs_header_alarm_icon_size"
android:layout_height="@dimen/qs_header_alarm_icon_size" android:layout_height="@dimen/qs_header_alarm_icon_size"
android:src="@drawable/stat_sys_alarm" android:src="@drawable/stat_sys_alarm"
android:tint="?android:attr/textColorPrimary" /> android:tint="?android:attr/textColorPrimary"
android:visibility="gone"/>
<TextView <TextView
android:id="@+id/next_alarm_text" android:id="@+id/next_alarm_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start" android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"
android:textAppearance="@style/TextAppearance.QS.TileLabel" /> android:textAppearance="@style/TextAppearance.QS.TileLabel"
android:visibility="gone"/>
<View <View
android:id="@+id/status_separator" android:id="@+id/status_separator"
@@ -61,20 +63,23 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@android:color/white" android:background="@android:color/white"
android:backgroundTint="?android:attr/textColorPrimary" /> android:backgroundTint="?android:attr/textColorPrimary"
android:visibility="gone"/>
<ImageView <ImageView
android:id="@+id/ringer_mode_icon" android:id="@+id/ringer_mode_icon"
android:layout_width="@dimen/qs_header_alarm_icon_size" android:layout_width="@dimen/qs_header_alarm_icon_size"
android:layout_height="@dimen/qs_header_alarm_icon_size" android:layout_height="@dimen/qs_header_alarm_icon_size"
android:tint="?android:attr/textColorPrimary" /> android:tint="?android:attr/textColorPrimary"
android:visibility="gone"/>
<TextView <TextView
android:id="@+id/ringer_mode_text" android:id="@+id/ringer_mode_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start" android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"
android:textAppearance="@style/TextAppearance.QS.TileLabel" /> android:textAppearance="@style/TextAppearance.QS.TileLabel"
android:visibility="gone"/>
</LinearLayout> </LinearLayout>

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

@@ -20,15 +20,12 @@
android:id="@+id/quick_status_bar_system_icons" android:id="@+id/quick_status_bar_system_icons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@*android:dimen/quick_qs_offset_height" 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:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"
android:paddingStart="@dimen/status_bar_padding_start" android:paddingStart="@dimen/status_bar_padding_start"
android:paddingEnd="@dimen/status_bar_padding_end" android:paddingEnd="@dimen/status_bar_padding_end" >
android:orientation="horizontal">
<com.android.systemui.statusbar.policy.Clock <com.android.systemui.statusbar.policy.Clock
android:id="@+id/clock" android:id="@+id/clock"

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

@@ -326,7 +326,7 @@
<dimen name="pull_span_min">25dp</dimen> <dimen name="pull_span_min">25dp</dimen>
<dimen name="qs_tile_height">106dp</dimen> <dimen name="qs_tile_height">106dp</dimen>
<dimen name="qs_tile_layout_margin_side">9dp</dimen> <dimen name="qs_tile_layout_margin_side">6dp</dimen>
<dimen name="qs_tile_margin_horizontal">18dp</dimen> <dimen name="qs_tile_margin_horizontal">18dp</dimen>
<dimen name="qs_tile_margin_vertical">24dp</dimen> <dimen name="qs_tile_margin_vertical">24dp</dimen>
<dimen name="qs_tile_margin_top_bottom">12dp</dimen> <dimen name="qs_tile_margin_top_bottom">12dp</dimen>

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

@@ -40,7 +40,7 @@ public class QSContainerImpl extends FrameLayout {
private int mHeightOverride = -1; private int mHeightOverride = -1;
private QSPanel mQSPanel; private QSPanel mQSPanel;
private View mQSDetail; private View mQSDetail;
private View mHeader; private QuickStatusBarHeader mHeader;
private float mQsExpansion; private float mQsExpansion;
private QSCustomizer mQSCustomizer; private QSCustomizer mQSCustomizer;
private View mQSFooter; private View mQSFooter;
@@ -178,7 +178,7 @@ public class QSContainerImpl extends FrameLayout {
setMargins(mBackground); setMargins(mBackground);
setMargins(mQSFooter); setMargins(mQSFooter);
mQSPanel.setMargins(mSideMargins); mQSPanel.setMargins(mSideMargins);
setMargins(mHeader); mHeader.setMargins(mSideMargins);
} }
private void setMargins(View view) { private void setMargins(View view) {

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

@@ -41,6 +41,7 @@ import android.util.Pair;
import android.view.View; import android.view.View;
import android.view.WindowInsets; import android.view.WindowInsets;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
@@ -591,4 +592,16 @@ public class QuickStatusBarHeader extends RelativeLayout implements
public static float getColorIntensity(@ColorInt int color) { public static float getColorIntensity(@ColorInt int color) {
return color == Color.WHITE ? 0 : 1; return color == Color.WHITE ? 0 : 1;
} }
public void setMargins(int sideMargins) {
for (int i = 0; i < getChildCount(); i++) {
View v = getChildAt(i);
if (v == mSystemIconsView || v == mQuickQsStatusIcons || v == mHeaderQsPanel) {
continue;
}
RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) v.getLayoutParams();
lp.leftMargin = sideMargins;
lp.rightMargin = sideMargins;
}
}
} }