Merge "Implement new QQS/QS headers" into sc-dev (ec012bc4) · Commits · e / os / android_frameworks_base

core/res/res/values-land/dimens.xml

+1 −3

Original line number	Diff line number	Diff line
		@@ -30,9 +30,7 @@
		<!-- Height of the status bar -->
		<dimen name="status_bar_height">@dimen/status_bar_height_landscape</dimen>
		<!-- Height of area above QQS where battery/time go -->
		<dimen name="quick_qs_offset_height">@dimen/status_bar_height_landscape</dimen>
		<!-- Total height of QQS in landscape, this is effectively status_bar_height_landscape + 128 -->
		<dimen name="quick_qs_total_height">152dp</dimen>
		<dimen name="quick_qs_offset_height">48dp</dimen>
		<!-- Default height of an action bar. -->
		<dimen name="action_bar_default_height">40dip</dimen>
		<!-- Vertical padding around action bar icons. -->

core/res/res/values/dimens.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,10 +47,6 @@
		<dimen name="status_bar_height_landscape">@dimen/status_bar_height_portrait</dimen>
		<!-- Height of area above QQS where battery/time go -->
		<dimen name="quick_qs_offset_height">48dp</dimen>
		<!-- Total height of QQS (quick_qs_offset_height + 128) -->
		<dimen name="quick_qs_total_height">176dp</dimen>
		<!-- Total height of QQS with two rows to fit media player (quick_qs_offset_height + 176) -->
		<dimen name="quick_qs_total_height_with_media">224dp</dimen>
		<!-- Height of the bottom navigation / system bar. -->
		<dimen name="navigation_bar_height">48dp</dimen>
		<!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->

core/res/res/values/symbols.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -1716,8 +1716,6 @@
		<java-symbol type="dimen" name="status_bar_height" />
		<java-symbol type="dimen" name="display_cutout_touchable_region_size" />
		<java-symbol type="dimen" name="quick_qs_offset_height" />
		<java-symbol type="dimen" name="quick_qs_total_height" />
		<java-symbol type="dimen" name="quick_qs_total_height_with_media" />
		<java-symbol type="drawable" name="ic_jog_dial_sound_off" />
		<java-symbol type="drawable" name="ic_jog_dial_sound_on" />
		<java-symbol type="drawable" name="ic_jog_dial_unlock" />

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+34 −14

Original line number	Diff line number	Diff line
		@@ -18,32 +18,52 @@
		xmlns:systemui="http://schemas.android.com/apk/res-auto"
		android:id="@+id/quick_qs_status_icons"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="@dimen/qs_header_top_padding"
		android:paddingBottom="@dimen/qs_header_bottom_padding"
		android:layout_below="@id/quick_status_bar_system_icons"
		android:layout_height="@*android:dimen/quick_qs_offset_height"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:minHeight="20dp"
		android:minHeight="48dp"
		android:clickable="false"
		android:focusable="true"
		android:theme="@style/QSHeaderTheme">

		<com.android.systemui.statusbar.policy.DateView
		android:id="@+id/date"
		<com.android.systemui.statusbar.policy.Clock
		android:id="@+id/clock"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="start\|center_vertical"
		android:gravity="center_vertical"
		android:layout_height="match_parent"
		android:minWidth="48dp"
		android:minHeight="48dp"
		android:gravity="center_vertical\|start"
		android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
		android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
		android:singleLine="true"
		android:textAppearance="@style/TextAppearance.QS.Status"
		systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />
		android:textAppearance="@style/TextAppearance.StatusBar.Clock" />

		<View
		android:layout_height="match_parent"
		android:layout_width="0dp"
		android:layout_weight="1"
		/>

		<!-- Will hold security footer in landscape with media -->
		<FrameLayout
		android:id="@+id/header_text_container"
		android:layout_height="match_parent"
		android:layout_width="wrap_content"
		android:gravity="center"
		/>

		<include layout="@layout/qs_carrier_group"
		android:id="@+id/carrier_group"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:minHeight="48dp"
		android:layout_gravity="end\|center_vertical"
		android:focusable="false"/>

		<com.android.systemui.statusbar.phone.StatusIconContainer
		android:id="@+id/statusIcons"
		android:layout_width="0dp"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:paddingEnd="@dimen/signal_cluster_battery_padding" />

		<com.android.systemui.BatteryMeterView

packages/SystemUI/res/layout/quick_settings_header_info.xml

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2018 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/header_text_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/qs_header_tooltip_height"
		android:layout_below="@id/quick_status_bar_system_icons"
		android:visibility="invisible"
		android:theme="@style/QSHeaderTheme"
		android:forceHasOverlappingRendering="false">

		<com.android.systemui.qs.QSHeaderInfoLayout
		android:id="@+id/status_container"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="match_parent">

		<LinearLayout
		android:id = "@+id/alarm_container"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		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/ic_alarm"
		android:contentDescription="@string/accessibility_quick_settings_alarm_set"
		android:visibility="gone"/>

		<com.android.systemui.util.AutoMarqueeTextView
		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"
		android:layout_width="@dimen/qs_header_separator_width"
		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: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"
		android:layout_height="@dimen/qs_header_alarm_icon_size"
		android:visibility="gone"/>

		<com.android.systemui.util.AutoMarqueeTextView
		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>
		</com.android.systemui.qs.QSHeaderInfoLayout>

		<include layout="@layout/qs_carrier_group"
		android:id="@+id/carrier_group"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginStart="@dimen/qs_status_separator"
		android:layout_gravity="end\|center_vertical"
		android:focusable="false"/>

		</LinearLayout>