Merge "Visual changes in QS and made targets clickable" into qt-dev (3a15b6c1) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/ongoing_privacy_chip.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@
		android:id="@+id/privacy_chip"
		android:layout_height="match_parent"
		android:layout_width="wrap_content"
		android:layout_marginLeft="@dimen/ongoing_appops_chip_margin"
		android:layout_marginRight="@dimen/ongoing_appops_chip_margin"
		android:layout_gravity="center_vertical\|end"
		android:gravity="center_vertical"
		android:orientation="horizontal"

packages/SystemUI/res/layout/qs_carrier.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		android:id="@+id/linear_carrier"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:minWidth="48dp"
		android:orientation="horizontal"
		android:gravity="center_vertical\|start"
		android:background="@android:color/transparent"

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/qs_header_top_margin"
		android:layout_marginBottom="14dp"
		android:layout_marginStart="@dimen/status_bar_padding_start"
		android:layout_marginEnd="@dimen/status_bar_padding_end"
		android:paddingStart="@dimen/status_bar_padding_start"
		android:paddingEnd="@dimen/status_bar_padding_end"
		android:layout_below="@id/quick_status_bar_system_icons"
		android:clipChildren="false"
		android:clipToPadding="false"

packages/SystemUI/res/layout/quick_settings_header_info.xml

+63 −35

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		android:layout_width="match_parent"
		android:layout_height="@dimen/qs_header_tooltip_height"
		android:layout_below="@id/quick_status_bar_system_icons"
		android:layout_marginTop="@dimen/qs_header_top_margin"
		android:paddingStart="@dimen/status_bar_padding_start"
		android:paddingEnd="@dimen/status_bar_padding_end">

		@@ -27,7 +26,7 @@
		android:id="@+id/long_press_tooltip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="start\|bottom"
		android:layout_gravity="start\|center_vertical"
		android:alpha="0"
		android:text="@string/quick_settings_header_onboarding_text"
		android:textAppearance="@style/TextAppearance.QS.TileLabel"
		@@ -36,34 +35,48 @@

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="start\|bottom"
		android:layout_height="match_parent"
		android:layout_gravity="start\|center_vertical"
		android:gravity="center_vertical">

		<LinearLayout
		android:id="@+id/status_container"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="start\|center_vertical"
		android:layout_weight="1"
		android:gravity="center_vertical"
		android:alpha="0" >

		<LinearLayout
		android:id = "@+id/alarm_container"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:gravity="center_vertical"
		android:focusable="true"
		android:clickable="true">

		<ImageView
		android:id="@+id/next_alarm_icon"
		android:layout_width="@dimen/qs_header_alarm_icon_size"
		android:layout_height="@dimen/qs_header_alarm_icon_size"
		android:src="@drawable/stat_sys_alarm"
		android:src="@drawable/ic_alarm"
		android:tint="?android:attr/textColorPrimary"
		android:contentDescription="@string/accessibility_quick_settings_alarm_set"
		android:visibility="gone"/>

		<TextView
		android:id="@+id/next_alarm_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:marqueeRepeatLimit="marquee_forever"
		android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"
		android:textAppearance="@style/TextAppearance.QS.Status"
		android:visibility="gone"/>
		</LinearLayout>

		<View
		android:id="@+id/status_separator"
		@@ -71,6 +84,15 @@
		android:layout_height="match_parent"
		android:visibility="gone"/>

		<LinearLayout
		android:id = "@+id/ringer_container"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:gravity="center_vertical"
		android:focusable="true"
		android:clickable="true">

		<ImageView
		android:id="@+id/ringer_mode_icon"
		android:layout_width="@dimen/qs_header_alarm_icon_size"
		@@ -82,10 +104,14 @@
		android:id="@+id/ringer_mode_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:marqueeRepeatLimit="marquee_forever"
		android:layout_marginStart="@dimen/qs_header_alarm_text_margin_start"
		android:textAppearance="@style/TextAppearance.QS.Status"
		android:visibility="gone"/>
		</LinearLayout>
		</LinearLayout>

		<View
		android:minWidth="@dimen/qs_status_separator"
		@@ -93,11 +119,13 @@
		android:layout_height="match_parent"
		android:layout_weight="1"/>


		<include layout="@layout/qs_carrier_group"
		android:id="@+id/carrier_group"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android_layout_gravity="center vertical\|end"/>
		android:layout_height="match_parent"
		android:layout_gravity="end\|center_vertical"
		android:focusable="false"/>
		</LinearLayout>

		</FrameLayout>

packages/SystemUI/res/values-land/dimens.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,8 @@

		<dimen name="brightness_mirror_height">40dp</dimen>

		<dimen name="qs_tile_margin_top">2dp</dimen>
		<dimen name="qs_header_tooltip_height">24dp</dimen>
		<dimen name="qs_tile_margin_top">8dp</dimen>
		<dimen name="qs_tile_margin_vertical">0dp</dimen>

		<dimen name="battery_detail_graph_space_top">9dp</dimen>
		<dimen name="battery_detail_graph_space_bottom">9dp</dimen>