Merge "Tuner updates" (6650e89d) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/Utils.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,13 @@ public class Utils {
		return colorAccent;
		}

		public static Drawable getDrawable(Context context, int attr) {
		TypedArray ta = context.obtainStyledAttributes(new int[]{attr});
		Drawable drawable = ta.getDrawable(0);
		ta.recycle();
		return drawable;
		}

		/**
		* Determine whether a package is a "system package", in which case certain things (like
		* disabling notifications or disabling the package altogether) should be disallowed.

packages/SystemUI/res/drawable/ic_remove_circle.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:height="48dp"
		android:width="48dp"
		android:tint="#db4437"
		android:viewportHeight="48"
		android:viewportWidth="48" >
		<path android:fillColor="@android:color/white"
		android:pathData="M24,4C12.95,4,4,12.95,4,24
		s8.95,20,20,20,20-8.95,20-20
		S35.05,4,24,4zm10,22H14v-4h20v4z"/>
		</vector>

packages/SystemUI/res/layout/preference_widget_radiobutton.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2006 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.
		-->

		<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
		inside android.R.layout.preference. -->
		<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@android:id/checkbox"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:focusable="false"
		android:clickable="false" />

packages/SystemUI/res/values/strings.xml

+58 −24

Original line number	Diff line number	Diff line
		@@ -1527,14 +1527,12 @@
		<!-- SysUI Tuner: Button that controls layout of navigation bar [CHAR LIMIT=60] -->
		<string name="nav_bar_layout">Layout</string>

		<!-- SysUI Tuner: Label for section of settings about the left nav button [CHAR LIMIT=60] -->
		<string name="nav_bar_left">Left</string>

		<!-- SysUI Tuner: Label for section of settings about the right nav button [CHAR LIMIT=60] -->
		<string name="nav_bar_right">Right</string>
		<!-- SysUI Tuner: Setting for button type in nav bar [CHAR LIMIT=60] -->
		<string name="left_nav_bar_button_type">Extra left button type</string>

		<!-- SysUI Tuner: Setting for button type in nav bar [CHAR LIMIT=60] -->
		<string name="nav_bar_button_type">Button type</string>
		<string name="right_nav_bar_button_type">Extra right button type</string>


		<!-- SysUI Tuner: Added to nav bar option to indicate it is the default [CHAR LIMIT=60] -->
		<string name="nav_bar_default"> (default)</string>
		@@ -1543,7 +1541,7 @@
		<string-array name="nav_bar_buttons">
		<item>Clipboard</item>
		<item>Keycode</item>
		<item>Menu / Keyboard Switcher</item>
		<item>Keyboard switcher</item>
		<item>None</item>
		</string-array>
		<string-array name="nav_bar_button_values" translatable="false">
		@@ -1555,10 +1553,10 @@

		<!-- SysUI Tuner: Labels for different types of navigation bar layouts [CHAR LIMIT=60] -->
		<string-array name="nav_bar_layouts">
		<item>Divided (default)</item>
		<item>Centered</item>
		<item>Left-aligned</item>
		<item>Right-aligned</item>
		<item>Normal</item>
		<item>Compact</item>
		<item>Left-leaning</item>
		<item>Right-leaning</item>
		</string-array>

		<string-array name="nav_bar_layouts_values" translatable="false">
		@@ -1569,7 +1567,7 @@
		</string-array>

		<!-- SysUI Tuner: Name of Combination Menu / Keyboard Switcher button [CHAR LIMIT=30] -->
		<string name="menu_ime">Menu / Keyboard Switcher</string>
		<string name="menu_ime">Keyboard switcher</string>
		<!-- SysUI Tuner: Save the current settings [CHAR LIMIT=30] -->
		<string name="save">Save</string>
		<!-- SysUI Tuner: Reset to default settings [CHAR LIMIT=30] -->
		@@ -1585,10 +1583,16 @@
		<string name="accessibility_key">Custom navigation button</string>

		<!-- SysUI Tuner: Nav bar button that emulates a keycode [CHAR LIMIT=30] -->
		<string name="keycode">Keycode</string>
		<string name="left_keycode">Left keycode</string>

		<!-- SysUI Tuner: Nav bar button that emulates a keycode [CHAR LIMIT=30] -->
		<string name="right_keycode">Right keycode</string>

		<!-- SysUI Tuner: Settings to change nav bar icon [CHAR LIMIT=30] -->
		<string name="icon">Icon</string>
		<string name="left_icon">Left icon</string>

		<!-- SysUI Tuner: Settings to change nav bar icon [CHAR LIMIT=30] -->
		<string name="right_icon">Right icon</string>

		<!-- Label for area where tiles can be dragged out of [CHAR LIMIT=60] -->
		<string name="drag_to_add_tiles">Drag to add tiles</string>
		@@ -1725,6 +1729,9 @@
		not appear on production builds ever. -->
		<string name="tuner_doze_always_on" translatable="false">Always on</string>

		<!-- SysUI Tuner: Section to customize lockscreen shortcuts [CHAR LIMIT=60] -->
		<string name="tuner_lock_screen">Lock screen</string>

		<!-- Making the PIP fullscreen [CHAR LIMIT=25] -->
		<string name="pip_phone_expand">Expand</string>

		@@ -1760,20 +1767,47 @@
		<!-- Text body for dialog alerting user that their phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=300] -->
		<string name="high_temp_dialog_message">Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally.</string>

		<!-- SysUI Tuner: Group of settings for left lock screen affordance [CHAR LIMIT=60] -->
		<string name="lockscreen_left">Left</string>
		<!-- SysUI Tuner: Button to select lock screen shortcut [CHAR LIMIT=60] -->
		<string name="lockscreen_shortcut_left">Left shortcut</string>

		<!-- SysUI Tuner: Button to select lock screen shortcut [CHAR LIMIT=60] -->
		<string name="lockscreen_shortcut_right">Right shortcut</string>

		<!-- SysUI Tuner: Group of settings for right lock screen affordance [CHAR LIMIT=60] -->
		<string name="lockscreen_right">Right</string>
		<!-- SysUI Tuner: Switch to control if device gets unlocked by left shortcut [CHAR LIMIT=60] -->
		<string name="lockscreen_unlock_left">Left shortcut also unlocks</string>

		<!-- SysUI Tuner: Switch controlling whether to customize lock screen button [CHAR LIMIT=60] -->
		<string name="lockscreen_customize">Customize shortcut</string>
		<!-- SysUI Tuner: Switch to control if device gets unlocked by right shortcut [CHAR LIMIT=60] -->
		<string name="lockscreen_unlock_right">Right shortcut also unlocks</string>

		<!-- SysUI Tuner: Button to select lock screen shortcut [CHAR LIMIT=60] -->
		<string name="lockscreen_shortcut">Shortcut</string>
		<!-- SysUI Tuner: Summary of no shortcut being selected [CHAR LIMIT=60] -->
		<string name="lockscreen_none">None</string>

		<!-- SysUI Tuner: Format string for describing launching an app [CHAR LIMIT=60] -->
		<string name="tuner_launch_app">Launch <xliff:g id="app" example="Settings">%1$s</xliff:g></string>

		<!-- SysUI Tuner: Label for section of other apps that can be launched [CHAR LIMIT=60] -->
		<string name="tuner_other_apps">Other apps</string>

		<!-- SysUI Tuner: Label for icon shaped like a circle [CHAR LIMIT=60] -->
		<string name="tuner_circle">Circle</string>

		<!-- SysUI Tuner: Label for icon shaped like a plus [CHAR LIMIT=60] -->
		<string name="tuner_plus">Plus</string>

		<!-- SysUI Tuner: Label for icon shaped like a minus [CHAR LIMIT=60] -->
		<string name="tuner_minus">Minus</string>

		<!-- SysUI Tuner: Label for icon shaped like a left [CHAR LIMIT=60] -->
		<string name="tuner_left">Left</string>

		<!-- SysUI Tuner: Label for icon shaped like a right [CHAR LIMIT=60] -->
		<string name="tuner_right">Right</string>

		<!-- SysUI Tuner: Label for icon shaped like a menu [CHAR LIMIT=60] -->
		<string name="tuner_menu">Menu</string>

		<!-- SysUI Tuner: Switch to control if device gets unlocked [CHAR LIMIT=60] -->
		<string name="lockscreen_unlock">Prompt for password</string>
		<!-- SysUI Tuner: App subheading for shortcut selection [CHAR LIMIT=60] -->
		<string name="tuner_app"><xliff:g id="app">%1$s</xliff:g> app</string>

		<!-- Title for the notification channel containing important alerts like low battery. [CHAR LIMIT=NONE] -->
		<string name="notification_channel_alerts">Alerts</string>

packages/SystemUI/res/xml/lockscreen_settings.xml

+19 −36

Original line number	Diff line number	Diff line
		@@ -18,42 +18,25 @@
		xmlns:sysui="http://schemas.android.com/apk/res-auto"
		android:title="@string/other">

		<PreferenceCategory
		android:key="left"
		android:title="@string/lockscreen_left">

		<SwitchPreference
		android:key="customize"
		android:title="@string/lockscreen_customize" />

		<Preference
		android:key="shortcut"
		android:title="@string/lockscreen_shortcut" />
		android:key="sysui_keyguard_left"
		android:title="@string/lockscreen_shortcut_left"
		android:fragment="com.android.systemui.tuner.ShortcutPicker" />

		<com.android.systemui.tuner.TunerSwitch
		android:key="sysui_keyguard_left_unlock"
		android:title="@string/lockscreen_unlock"
		android:title="@string/lockscreen_unlock_left"
		sysui:defValue="true" />

		</PreferenceCategory>

		<PreferenceCategory
		android:key="right"
		android:title="@string/lockscreen_right">

		<SwitchPreference
		android:key="customize"
		android:title="@string/lockscreen_customize" />

		<Preference
		android:key="shortcut"
		android:title="@string/lockscreen_shortcut" />
		android:key="sysui_keyguard_right"
		android:title="@string/lockscreen_shortcut_right"
		android:fragment="com.android.systemui.tuner.ShortcutPicker" />

		<com.android.systemui.tuner.TunerSwitch
		android:key="sysui_keyguard_right_unlock"
		android:title="@string/lockscreen_unlock"
		android:title="@string/lockscreen_unlock_right"
		sysui:defValue="true" />

		</PreferenceCategory>

		</PreferenceScreen>