Merge "Quick prototype of new header" (c7e19d9f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

0 → 100644

+146 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		** Copyright 2015, 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.
		-->

		<!-- Extends RelativeLayout -->
		<com.android.systemui.statusbar.phone.QuickStatusBarHeader
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res-auto"
		android:id="@+id/header"
		android:layout_width="@dimen/notification_panel_width"
		android:layout_height="@dimen/status_bar_header_height"
		android:layout_gravity="@integer/notification_panel_layout_gravity"
		android:baselineAligned="false"
		android:elevation="4dp"
		android:background="@drawable/notification_header_bg"
		android:clickable="true"
		android:focusable="true"
		>

		<LinearLayout
		android:id="@+id/expanded_group"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingEnd="12dp"
		android:orientation="horizontal">

		<com.android.systemui.statusbar.AlphaOptimizedButton android:id="@+id/alarm_status"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginBottom="4dp"
		android:drawablePadding="6dp"
		android:drawableStart="@drawable/ic_access_alarms_small"
		android:textColor="#64ffffff"
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
		android:paddingEnd="6dp"
		android:paddingStart="6dp"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:background="?android:attr/selectableItemBackground"
		android:visibility="gone"
		/>

		<com.android.systemui.statusbar.policy.DateView android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="16dp"
		android:singleLine="true"
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
		android:layout_below="@id/clock"
		systemui:datePattern="EEE"
		android:gravity="center_vertical"
		android:textSize="20sp"
		android:paddingTop="16dp"
		android:layout_marginBottom="@dimen/clock_collapsed_bottom_margin" />

		<include layout="@layout/split_clock_view"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginStart="16dp"
		android:layout_marginTop="16dp"
		android:id="@+id/clock"
		/>

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

		<com.android.systemui.statusbar.AlphaOptimizedFrameLayout
		android:id="@+id/settings_button_container"
		android:layout_width="48dp"
		android:layout_height="@dimen/status_bar_header_height"
		android:clipChildren="false"
		android:clipToPadding="false">

		<com.android.systemui.statusbar.phone.SettingsButton android:id="@+id/settings_button"
		style="@android:style/Widget.Material.Button.Borderless"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@drawable/ripple_drawable"
		android:src="@drawable/ic_settings"
		android:contentDescription="@string/accessibility_desc_settings" />
		<com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/tuner_icon"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:paddingStart="36dp"
		android:tint="#4DFFFFFF"
		android:tintMode="src_in"
		android:visibility="invisible"
		android:src="@drawable/tuner" />

		</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
		</LinearLayout>

		<include
		android:id="@+id/qs_detail_header"
		layout="@layout/qs_detail_header"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="true"
		/>

		<com.android.systemui.qs.QuickQSPanel
		android:id="@+id/quick_qs_panel"
		android:background="#0000"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		<com.android.systemui.statusbar.AlphaOptimizedImageView
		android:id="@+id/qs_detail_header_progress"
		android:src="@drawable/indeterminate_anim"
		android:alpha="0"
		android:background="@color/qs_detail_progress_track"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="true"
		systemui:hasOverlappingRendering="false"
		/>

		<TextView
		android:id="@+id/header_debug_info"
		android:visibility="invisible"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:fontFamily="sans-serif-condensed"
		android:textSize="11dp"
		android:textStyle="bold"
		android:textColor="#00A040"
		android:padding="2dp"
		/>

		</com.android.systemui.statusbar.phone.QuickStatusBarHeader>

packages/SystemUI/res/layout/status_bar_expanded.xml

+6 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,12 @@
		layout="@layout/keyguard_bottom_area"
		android:visibility="gone" />

		<include layout="@layout/status_bar_expanded_header" />
		<ViewStub
		android:id="@+id/status_bar_header"
		android:layout_width="@dimen/notification_panel_width"
		android:layout_height="@dimen/status_bar_header_height"
		android:layout_marginStart="@dimen/notification_side_padding"
		android:layout_marginEnd="@dimen/notification_side_padding" />

		<com.android.systemui.statusbar.AlphaOptimizedView
		android:id="@+id/qs_navbar_scrim"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@
		android:layout_width="@dimen/notification_panel_width"
		android:layout_height="@dimen/status_bar_header_height"
		android:layout_gravity="@integer/notification_panel_layout_gravity"
		android:paddingStart="@dimen/notification_side_padding"
		android:paddingEnd="@dimen/notification_side_padding"
		android:baselineAligned="false"
		android:elevation="4dp"
		android:background="@drawable/notification_header_bg"

packages/SystemUI/res/values/dimens.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -556,4 +556,7 @@
		<dimen name="fab_margin">16dp</dimen>
		<dimen name="fab_elevation">12dp</dimen>
		<dimen name="fab_press_translation_z">9dp</dimen>

		<!-- TODO: Remove this -->
		<dimen name="qs_header_neg_padding">-8dp</dimen>
		</resources>

packages/SystemUI/res/values/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1156,7 +1156,7 @@
		<!-- Option to show brightness bar in quick settings [CHAR LIMIT=60] -->
		<string name="show_brightness">Show brightness in Quick Settings</string>
		<!-- Option to use new paging layout in quick settings [CHAR LIMIT=60] -->
		<string name="qs_paging">Use paging in Quick Settings</string>
		<string name="qs_paging" translatable="false">Use the new Quick Settings</string>

		<!-- Category in the System UI Tuner settings, where new/experimental
		settings are -->