Merge "Tuner volume dnd panel work" into nyc-dev (ea834eca) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/qs_detail.xml

+1 −25

Original line number	Diff line number	Diff line
		@@ -50,30 +50,6 @@
		android:layout_height="0dp"
		android:layout_weight="1" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingEnd="8dp"
		android:gravity="end">

		<TextView
		android:id="@android:id/button2"
		style="@style/QSBorderlessButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="8dp"
		android:minWidth="132dp"
		android:textAppearance="@style/TextAppearance.QS.DetailButton"
		android:focusable="true" />

		<TextView
		android:id="@android:id/button1"
		style="@style/QSBorderlessButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="88dp"
		android:textAppearance="@style/TextAppearance.QS.DetailButton"
		android:focusable="true"/>
		<include layout="@layout/qs_detail_buttons" />

		</LinearLayout>
		</com.android.systemui.qs.QSDetail>

packages/SystemUI/res/layout/qs_detail_buttons.xml

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2016 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:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingEnd="8dp"
		android:gravity="end">

		<TextView
		android:id="@android:id/button2"
		style="@style/QSBorderlessButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="8dp"
		android:minWidth="132dp"
		android:textAppearance="@style/TextAppearance.QS.DetailButton"
		android:focusable="true" />

		<TextView
		android:id="@android:id/button1"
		style="@style/QSBorderlessButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="88dp"
		android:textAppearance="@style/TextAppearance.QS.DetailButton"
		android:focusable="true"/>

		</LinearLayout>

packages/SystemUI/res/layout/tuner_zen_mode_panel.xml

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2016 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 LinearLayout -->
		<com.android.systemui.tuner.TunerZenModePanel
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/tuner_zen_mode_panel"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="false"
		android:visibility="gone"
		android:orientation="vertical" >

		<View
		android:id="@+id/zen_embedded_divider"
		android:layout_width="match_parent"
		android:layout_height="1dp"
		android:layout_marginBottom="12dp"
		android:layout_marginTop="8dp"
		android:background="@color/qs_tile_divider" />

		<include
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:layout_marginStart="16dp"
		android:id="@+id/tuner_zen_switch"
		layout="@layout/qs_detail_header" />

		<include layout="@layout/zen_mode_panel" />

		<include
		android:id="@+id/tuner_zen_buttons"
		layout="@layout/qs_detail_buttons" />

		</com.android.systemui.tuner.TunerZenModePanel>

packages/SystemUI/res/layout/volume_dialog.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		<include layout="@layout/volume_zen_footer" />

		<!-- Only shown from Tuner setting -->
		<include layout="@layout/zen_mode_panel" />
		<include layout="@layout/tuner_zen_mode_panel" />
		</LinearLayout>

		</RelativeLayout>

packages/SystemUI/res/values/strings.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -810,12 +810,6 @@
		<!-- Interruption level: Alarms only. Optimized for narrow two-line display. [CHAR LIMIT=40] -->
		<string name="interruption_level_alarms_twoline">Alarms\nonly</string>

		<!-- Interruption level: All interruptions. [CHAR LIMIT=40] -->
		<string name="interruption_level_all">All</string>

		<!-- Interruption level: All interruptions. Optimized for narrow two-line display. [CHAR LIMIT=40] -->
		<string name="interruption_level_all_twoline">All\n</string>

		<!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
		<string name="keyguard_indication_charging_time">Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> until full)</string>