diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-10-24 16:20:37 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-10-25 13:07:42 -0700 |
commit | eae0514f1a8bcb9d498e146e7de78ddc187cbb17 (patch) | |
tree | f61aac6d7bc4871e7c6523a82bc594099023ec4a /res | |
parent | 0d9275deba38a5f650b2323513bbdd5a5a823055 (diff) | |
download | android_packages_apps_Trebuchet-eae0514f1a8bcb9d498e146e7de78ddc187cbb17.tar.gz android_packages_apps_Trebuchet-eae0514f1a8bcb9d498e146e7de78ddc187cbb17.tar.bz2 android_packages_apps_Trebuchet-eae0514f1a8bcb9d498e146e7de78ddc187cbb17.zip |
Moving Plugin and feature flags UI to androidX
> Combining both preference into a single screen
> Adding plugin preference screen so quickstep build
Change-Id: I3d2ff3ebdac3c774659e79ecb81be6f75f765eb0
Diffstat (limited to 'res')
-rw-r--r-- | res/values/config.xml | 7 | ||||
-rw-r--r-- | res/xml/flag_preferences.xml | 24 | ||||
-rw-r--r-- | res/xml/launcher_preferences.xml | 6 |
3 files changed, 8 insertions, 29 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 946afecf8..5e83ab766 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -19,7 +19,7 @@ <string name="delete_package_intent" translatable="false">#Intent;action=android.intent.action.DELETE;launchFlags=0x10800000;end</string> <!-- String representing the fragment class for settings activity.--> - <string name="settings_fragment_name" translatable="false">com.android.launcher3.SettingsActivity$LauncherSettingsFragment</string> + <string name="settings_fragment_name" translatable="false">com.android.launcher3.settings.SettingsActivity$LauncherSettingsFragment</string> <!-- Values for icon shape overrides. These should correspond to entries defined in icon_shape_override_paths_names --> @@ -105,7 +105,10 @@ <item type="id" name="view_unhighlight_background" /> <item type="id" name="view_highlighted" /> -<!-- Popup items --> + <!-- Menu id for feature flags --> + <item type="id" name="menu_apply_flags" /> + + <!-- Popup items --> <integer name="config_popupOpenCloseDuration">150</integer> <integer name="config_popupArrowOpenCloseDuration">40</integer> <integer name="config_removeNotificationViewDuration">300</integer> diff --git a/res/xml/flag_preferences.xml b/res/xml/flag_preferences.xml deleted file mode 100644 index aea1a6ab7..000000000 --- a/res/xml/flag_preferences.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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. - */ ---> - -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:key="feature_flags" - android:persistent="false"> - -</PreferenceScreen>
\ No newline at end of file diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml index c55cc4985..2c86f8ebf 100644 --- a/res/xml/launcher_preferences.xml +++ b/res/xml/launcher_preferences.xml @@ -54,9 +54,9 @@ android:persistent="false" /> <androidx.preference.PreferenceScreen - android:fragment="com.android.launcher3.config.FlagTogglerPreferenceFragment" - android:key="flag_toggler" + android:key="pref_developer_options" android:persistent="false" - android:title="Feature flags"/> + android:title="Developer Options" + android:fragment="com.android.launcher3.settings.DeveloperOptionsFragment"/> </androidx.preference.PreferenceScreen> |