Merge "Move ManageApplications to sub package and remove dead code" (bda0d166) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+12 −31

Original line number	Diff line number	Diff line
		@@ -987,6 +987,7 @@
		<intent-filter android:priority="1">
		<action android:name="android.settings.APPLICATION_SETTINGS" />
		<action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
		<action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		@@ -996,7 +997,7 @@
		<category android:name="com.android.settings.SHORTCUT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>
		@@ -1043,19 +1044,6 @@
		android:value="com.android.settings.applications.ProcessStatsUi" />
		</activity>

		<activity android:name="Settings$AllApplicationsActivity"
		android:label="@string/applications_settings"
		android:taskAffinity="">
		<intent-filter>
		<action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

		<activity android:name="Settings$HighPowerApplicationsActivity"
		android:label="@string/high_power_apps"
		android:taskAffinity="">
		@@ -1064,7 +1052,7 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>
		@@ -1096,14 +1084,7 @@
		android:exported="true"
		android:targetActivity="Settings$ManageApplicationsActivity">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		</activity-alias>

		<!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
		<activity-alias android:name=".ManageApplications"
		android:label="@string/manageapplications_settings_title"
		android:exported="true"
		android:targetActivity="Settings$ManageApplicationsActivity">
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity-alias>

		<!-- Provide direct entry into manage apps showing running services.
		@@ -1113,7 +1094,7 @@
		android:exported="true"
		android:targetActivity="Settings$ManageApplicationsActivity">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity-alias>

		<!-- Provide direct entry into manage apps showing storage usage for apps.
		@@ -1123,7 +1104,7 @@
		android:exported="true"
		android:targetActivity="Settings$ManageApplicationsActivity">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity-alias>

		<!-- Still need a top-level activity for showing app details. Aliasing
		@@ -1160,7 +1141,7 @@
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>
		@@ -1181,7 +1162,7 @@
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>
		@@ -1403,7 +1384,7 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity>

		<activity-alias android:name="SetProfileOwner"
		@@ -2953,7 +2934,7 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity>

		<activity android:name="Settings$AppDrawOverlaySettingsActivity"
		@@ -2976,7 +2957,7 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity>


		@@ -3000,7 +2981,7 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.ManageApplications" />
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity>

		<activity android:name="Settings$ManageAppExternalSourcesActivity"

res/xml/application_settings.xml

deleted100644 → 0

+0 −64

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

		<!--

		This code is deprecated. This screen is no longer used in Settings.
		The ApplicationSettings class is kept in case an external app references it directly.

		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		android:title="@string/applications_settings"
		android:summary="@string/applications_settings_summary"
		android:key="applications_settings">

		<Preference
		android:fragment="com.android.settings.applications.ManageApplications"
		android:title="@string/manageapplications_settings_title"
		android:summary="@string/manageapplications_settings_summary">
		</Preference>

		<Preference
		android:fragment="com.android.settings.applications.ManageApplications"
		android:title="@string/runningservices_settings_title"
		android:summary="@string/runningservices_settings_summary">
		<extra android:name="classname" android:value="com.android.settings.Settings$RunningServicesActivity" />
		</Preference>

		<Preference
		android:fragment="com.android.settings.applications.ManageApplications"
		android:title="@string/storageuse_settings_title"
		android:summary="@string/storageuse_settings_summary">
		<extra android:name="classname"
		android:value="com.android.settings.Settings$StorageUseActivity" />
		</Preference>

		<CheckBoxPreference
		android:key="toggle_advanced_settings"
		android:title="@string/advanced_settings"
		android:summaryOff="@string/advanced_settings_summary"
		android:summaryOn="@string/advanced_settings_summary" />

		<ListPreference
		android:key="app_install_location"
		android:title="@string/app_install_location_title"
		android:summary="@string/app_install_location_summary"
		android:entries="@array/app_install_location_entries"
		android:entryValues="@array/app_install_location_values"/>

		</PreferenceScreen>

res/xml/security_settings_misc.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@

		<Preference android:key="usage_access"
		android:title="@string/usage_access_title"
		android:fragment="com.android.settings.applications.ManageApplications">
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
		<extra
		android:name="classname"
		android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />

res/xml/special_access.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		<Preference
		android:key="high_power_apps"
		android:title="@string/high_power_apps"
		android:fragment="com.android.settings.applications.ManageApplications"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		settings:keywords="@string/keywords_ignore_optimizations">
		<extra
		android:name="classname"
		@@ -37,7 +37,7 @@
		<Preference
		android:key="system_alert_window"
		android:title="@string/system_alert_window_settings"
		android:fragment="com.android.settings.applications.ManageApplications"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		settings:keywords="@string/keywords_system_alert_window">
		<extra
		android:name="classname"
		@@ -52,7 +52,7 @@
		<Preference
		android:key="write_settings_apps"
		android:title="@string/write_settings"
		android:fragment="com.android.settings.applications.ManageApplications"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		settings:keywords="@string/keywords_write_settings">
		<extra
		android:name="classname"
		@@ -83,7 +83,7 @@
		<Preference
		android:key="manage_external_sources"
		android:title="@string/install_other_apps"
		android:fragment="com.android.settings.applications.ManageApplications"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		settings:keywords="@string/keywords_install_other_apps">
		<extra
		android:name="classname"
		@@ -93,7 +93,7 @@
		<Preference
		android:key="usage_access"
		android:title="@string/usage_access"
		android:fragment="com.android.settings.applications.ManageApplications"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		settings:keywords="@string/keywords_write_settings">
		<extra
		android:name="classname"

src/com/android/settings/ApplicationSettings.java

deleted100644 → 0

+0 −143

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 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.
		*/

		package com.android.settings;

		import android.content.Intent;
		import android.os.Bundle;
		import android.provider.Settings;
		import android.support.v7.preference.CheckBoxPreference;
		import android.support.v7.preference.ListPreference;
		import android.support.v7.preference.Preference;
		import android.support.v7.preference.Preference.OnPreferenceChangeListener;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

		public class ApplicationSettings extends SettingsPreferenceFragment {

		private static final String KEY_TOGGLE_ADVANCED_SETTINGS = "toggle_advanced_settings";
		private static final String KEY_APP_INSTALL_LOCATION = "app_install_location";

		// App installation location. Default is ask the user.
		private static final int APP_INSTALL_AUTO = 0;
		private static final int APP_INSTALL_DEVICE = 1;
		private static final int APP_INSTALL_SDCARD = 2;

		private static final String APP_INSTALL_DEVICE_ID = "device";
		private static final String APP_INSTALL_SDCARD_ID = "sdcard";
		private static final String APP_INSTALL_AUTO_ID = "auto";

		private CheckBoxPreference mToggleAdvancedSettings;
		private ListPreference mInstallLocation;

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.APPLICATION;
		}

		@Override
		public void onCreate(Bundle icicle) {
		super.onCreate(icicle);

		addPreferencesFromResource(R.xml.application_settings);

		mToggleAdvancedSettings = (CheckBoxPreference)findPreference(
		KEY_TOGGLE_ADVANCED_SETTINGS);
		mToggleAdvancedSettings.setChecked(isAdvancedSettingsEnabled());
		getPreferenceScreen().removePreference(mToggleAdvancedSettings);

		// not ready for prime time yet
		if (false) {
		getPreferenceScreen().removePreference(mInstallLocation);
		}

		mInstallLocation = (ListPreference) findPreference(KEY_APP_INSTALL_LOCATION);
		// Is app default install location set?
		boolean userSetInstLocation = (Settings.Global.getInt(getContentResolver(),
		Settings.Global.SET_INSTALL_LOCATION, 0) != 0);
		if (!userSetInstLocation) {
		getPreferenceScreen().removePreference(mInstallLocation);
		} else {
		mInstallLocation.setValue(getAppInstallLocation());
		mInstallLocation.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		String value = (String) newValue;
		handleUpdateAppInstallLocation(value);
		return false;
		}
		});
		}
		}

		protected void handleUpdateAppInstallLocation(final String value) {
		if(APP_INSTALL_DEVICE_ID.equals(value)) {
		Settings.Global.putInt(getContentResolver(),
		Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE);
		} else if (APP_INSTALL_SDCARD_ID.equals(value)) {
		Settings.Global.putInt(getContentResolver(),
		Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD);
		} else if (APP_INSTALL_AUTO_ID.equals(value)) {
		Settings.Global.putInt(getContentResolver(),
		Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
		} else {
		// Should not happen, default to prompt...
		Settings.Global.putInt(getContentResolver(),
		Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
		}
		mInstallLocation.setValue(value);
		}

		@Override
		public boolean onPreferenceTreeClick(Preference preference) {
		if (preference == mToggleAdvancedSettings) {
		boolean value = mToggleAdvancedSettings.isChecked();
		setAdvancedSettingsEnabled(value);
		}

		return super.onPreferenceTreeClick(preference);
		}

		private boolean isAdvancedSettingsEnabled() {
		return Settings.System.getInt(getContentResolver(),
		Settings.System.ADVANCED_SETTINGS,
		Settings.System.ADVANCED_SETTINGS_DEFAULT) > 0;
		}

		private void setAdvancedSettingsEnabled(boolean enabled) {
		int value = enabled ? 1 : 0;
		// Change the system setting
		Settings.Secure.putInt(getContentResolver(), Settings.System.ADVANCED_SETTINGS, value);
		// TODO: the settings thing should broadcast this for thread safety purposes.
		Intent intent = new Intent(Intent.ACTION_ADVANCED_SETTINGS_CHANGED);
		intent.putExtra("state", value);
		getActivity().sendBroadcast(intent);
		}

		private String getAppInstallLocation() {
		int selectedLocation = Settings.Global.getInt(getContentResolver(),
		Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
		if (selectedLocation == APP_INSTALL_DEVICE) {
		return APP_INSTALL_DEVICE_ID;
		} else if (selectedLocation == APP_INSTALL_SDCARD) {
		return APP_INSTALL_SDCARD_ID;
		} else if (selectedLocation == APP_INSTALL_AUTO) {
		return APP_INSTALL_AUTO_ID;
		} else {
		// Default value, should not happen.
		return APP_INSTALL_AUTO_ID;
		}
		}
		}