Merge "Remove old code from DisplaySettings not used in new IA." (b567ff46) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+4 −17

Original line number	Diff line number	Diff line
		@@ -904,15 +904,17 @@
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		<category android:name="com.android.settings.SHORTCUT" />
		</intent-filter>
		<intent-filter android:priority="9">
		<intent-filter android:priority="7">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.device" />
		android:value="com.android.settings.category.ia.homepage" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.DisplaySettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/display_dashboard_summary"/>
		</activity>

		<!-- Keep compatibility with old shortcuts. -->
		@@ -3055,21 +3057,6 @@
		android:value="com.android.settings.category.ia.homepage"/>
		</activity-alias>

		<activity-alias android:name="DisplayDashboardAlias"
		android:targetActivity="Settings$DisplaySettingsActivity">
		<intent-filter android:priority="7">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.homepage" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.DisplaySettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/display_dashboard_summary"/>
		</activity-alias>

		<activity-alias android:name="SoundDashboardAlias"
		android:targetActivity="Settings$SoundSettingsActivity"
		android:icon="@drawable/ic_dashboard_sound">

res/xml/display_settings.xml

deleted100644 → 0

+0 −119

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2010 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"
		xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
		android:title="@string/display_settings"
		settings:keywords="@string/keywords_display">

		<Preference
		android:key="brightness"
		android:title="@string/brightness"
		settings:keywords="@string/keywords_display_brightness_level">
		<intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
		</Preference>

		<SwitchPreference
		android:key="auto_brightness"
		android:title="@string/auto_brightness_title"
		settings:keywords="@string/keywords_display_auto_brightness"
		android:summary="@string/auto_brightness_summary" />

		<com.android.settings.display.NightDisplayPreference
		android:key="night_display"
		android:title="@string/night_display_title"
		android:fragment="com.android.settings.display.NightDisplaySettings"
		settings:widgetLayout="@null"
		settings:keywords="@string/keywords_display_night_display" />

		<!-- Hide night mode for now
		<ListPreference
		android:key="night_mode"
		android:title="@string/night_mode_title"
		settings:keywords="@string/keywords_display_night_mode"
		android:summary="@string/night_mode_summary"
		android:entries="@array/night_mode_entries"
		android:entryValues="@array/night_mode_values" /> -->

		<com.android.settingslib.RestrictedPreference
		android:key="wallpaper"
		android:title="@string/wallpaper_settings_title"
		settings:keywords="@string/keywords_display_wallpaper"
		settings:useAdminDisabledSummary="true" >
		<intent
		android:targetPackage="@string/config_wallpaper_picker_package"
		android:targetClass="@string/config_wallpaper_picker_class" />
		</com.android.settingslib.RestrictedPreference>

		<com.android.settings.TimeoutListPreference
		android:key="screen_timeout"
		android:title="@string/screen_timeout"
		android:summary="@string/screen_timeout_summary"
		android:entries="@array/screen_timeout_entries"
		android:entryValues="@array/screen_timeout_values" />

		<SwitchPreference
		android:key="camera_gesture"
		android:title="@string/camera_gesture_title"
		android:summary="@string/camera_gesture_desc" />

		<Preference
		android:key="screensaver"
		android:title="@string/screensaver_settings_title"
		android:fragment="com.android.settings.DreamSettings" />

		<SwitchPreference
		android:key="lift_to_wake"
		android:title="@string/lift_to_wake_title" />

		<SwitchPreference
		android:key="doze"
		android:title="@string/doze_title"
		android:summary="@string/doze_summary" />

		<SwitchPreference
		android:key="tap_to_wake"
		android:title="@string/tap_to_wake"
		android:summary="@string/tap_to_wake_summary" />

		<Preference
		android:key="font_size"
		android:title="@string/title_font_size"
		android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
		settings:keywords="@string/keywords_display_font_size" />

		<com.android.settings.display.ScreenZoomPreference
		android:key="screen_zoom"
		android:title="@string/screen_zoom_title"
		settings:keywords="@string/screen_zoom_keywords" />

		<DropDownPreference
		android:key="auto_rotate"
		android:summary="%s"
		android:title="@string/display_auto_rotate_title" />

		<Preference
		android:key="wifi_display"
		android:title="@string/wifi_display_settings_title"
		settings:keywords="@string/keywords_display_cast_screen"
		android:fragment="com.android.settings.wfd.WifiDisplaySettings" />

		<DropDownPreference
		android:key="vr_display_pref"
		android:summary="%s"
		android:title="@string/display_vr_pref_title" />

		</PreferenceScreen>

src/com/android/settings/DisplaySettings.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -64,11 +64,7 @@ public class DisplaySettings extends DashboardFragment {

		@Override
		protected int getPreferenceScreenResId() {
		if (mDashboardFeatureProvider.isEnabled()) {
		return R.xml.ia_display_settings;
		} else {
		return R.xml.display_settings;
		}
		}

		@Override
		@@ -104,14 +100,7 @@ public class DisplaySettings extends DashboardFragment {
		final ArrayList<SearchIndexableResource> result = new ArrayList<>();

		final SearchIndexableResource sir = new SearchIndexableResource(context);
		final boolean useNewIA = FeatureFactory.getFactory(context)
		.getDashboardFeatureProvider(context)
		.isEnabled();
		if (useNewIA) {
		sir.xmlResId = R.xml.ia_display_settings;
		} else {
		sir.xmlResId = R.xml.display_settings;
		}
		result.add(sir);
		return result;
		}

src/com/android/settings/core/gateway/SettingsGateway.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,6 @@ public class SettingsGateway {
		Settings.ConnectedDeviceDashboardActivity.class.getName(),
		Settings.AppAndNotificationDashboardActivity.class.getName(),
		"com.android.settings.BatteryDashboardAlias",
		"com.android.settings.DisplayDashboardAlias",
		"com.android.settings.SoundDashboardAlias",
		"com.android.settings.SecurityDashboardAlias",
		"com.android.settings.UsersDashboardAlias",