PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ManageApplications to sub package and remove dead code

Browse Source 
Bug: 64804294
Test: rerun test
Change-Id: I23cbd8da9b65f52470030ba3b9b676ece2bada11
This commit is contained in:
Fan Zhang
2017-10-11 16:44:41 -07:00
parent 350ccf53f2
commit a8cac7a409
35 changed files with 122 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
src/com/android/settings/ApplicationSettings.java
View File

@@ -1,143 +0,0 @@
/*
* 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;
}
}
}

1
src/com/android/settings/Settings.java
View File

@@ -56,7 +56,6 @@ public class Settings extends SettingsActivity {
public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
public static class ManageAssistActivity extends SettingsActivity { /* empty */ }
public static class AllApplicationsActivity extends SettingsActivity { /* empty */ }
public static class HighPowerApplicationsActivity extends SettingsActivity { /* empty */ }
public static class AppOpsSummaryActivity extends SettingsActivity {
@Override

6
src/com/android/settings/SettingsActivity.java
View File

@@ -53,6 +53,7 @@ import android.widget.Toolbar;
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.backup.BackupSettingsActivity;
import com.android.settings.core.gateway.SettingsGateway;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -594,11 +595,10 @@ public class SettingsActivity extends SettingsDrawerActivity
String intentClass = intent.getComponent().getClassName();
if (intentClass.equals(getClass().getName())) return null;
if ("com.android.settings.ManageApplications".equals(intentClass)
|| "com.android.settings.RunningServices".equals(intentClass)
if ("com.android.settings.RunningServices".equals(intentClass)
|| "com.android.settings.applications.StorageUse".equals(intentClass)) {
// Old names of manage apps.
intentClass = com.android.settings.applications.ManageApplications.class.getName();
intentClass = ManageApplications.class.getName();
}
return intentClass;

5
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.applications;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -42,6 +44,7 @@ import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
@@ -51,8 +54,6 @@ import com.android.settingslib.applications.ApplicationsState.AppEntry;
import java.util.ArrayList;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
public abstract class AppInfoBase extends SettingsPreferenceFragment
implements ApplicationsState.Callbacks {

1
src/com/android/settings/applications/AppOpsDetails.java
View File

@@ -40,6 +40,7 @@ import android.widget.Switch;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;

2
src/com/android/settings/applications/AppStateInstallAppsBridge.java
View File

@@ -135,7 +135,7 @@ public class AppStateInstallAppsBridge extends AppStateBaseBridge {
}
}
static final AppFilter FILTER_APP_SOURCES = new AppFilter() {
public static final AppFilter FILTER_APP_SOURCES = new AppFilter() {
@Override
public void init() {

8
src/com/android/settings/applications/ExternalSourcesDetails.java
View File

@@ -15,6 +15,9 @@
*/
package com.android.settings.applications;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import android.app.AlertDialog;
import android.app.AppOpsManager;
import android.content.Context;
@@ -31,9 +34,6 @@ import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsSt
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
public class ExternalSourcesDetails extends AppInfoWithHeader
implements OnPreferenceChangeListener {
@@ -76,7 +76,7 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
return false;
}
static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
public static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
final UserManager um = UserManager.get(context);
final int userRestrictionSource = um.getUserRestrictionSource(
UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,

1
src/com/android/settings/applications/NotificationApps.java
View File

@@ -19,6 +19,7 @@ import android.content.Context;
import android.content.pm.ApplicationInfo;
import com.android.settings.R;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.wrapper.PackageManagerWrapper;

2
src/com/android/settings/applications/AppViewHolder.java → src/com/android/settings/applications/manageapplications/AppViewHolder.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.manageapplications;
import android.util.Log;
import android.view.LayoutInflater;

7
src/com/android/settings/applications/FileViewHolderController.java → src/com/android/settings/applications/manageapplications/FileViewHolderController.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 The Android Open Source Project
* 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.
@@ -11,13 +11,12 @@
* 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
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.manageapplications;
import android.app.Fragment;
import android.view.View;
/**
* FileViewHolderController handles adapting the AppViewHolder to work as a general purpose

25
src/com/android/settings/applications/ManageApplications.java → src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.manageapplications;
import android.annotation.IdRes;
import android.annotation.Nullable;
@@ -60,7 +60,6 @@ import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Settings.AllApplicationsActivity;
import com.android.settings.Settings.GamesStorageActivity;
import com.android.settings.Settings.HighPowerApplicationsActivity;
import com.android.settings.Settings.ManageExternalSourcesActivity;
@@ -72,8 +71,25 @@ import com.android.settings.Settings.UsageAccessSettingsActivity;
import com.android.settings.Settings.WriteSettingsActivity;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateNotificationBridge;
import com.android.settings.applications.AppStateOverlayBridge;
import com.android.settings.applications.AppStatePowerBridge;
import com.android.settings.applications.AppStateUsageBridge;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
import com.android.settings.applications.AppStateWriteSettingsBridge;
import com.android.settings.applications.AppStorageSettings;
import com.android.settings.applications.DefaultAppSettings;
import com.android.settings.applications.DrawOverlayDetails;
import com.android.settings.applications.ExternalSourcesDetails;
import com.android.settings.applications.InstalledAppCounter;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.NotificationApps;
import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.WriteSettingsDetails;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.fuelgauge.HighPowerDetail;
@@ -299,9 +315,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
if (className == null) {
className = intent.getComponent().getClassName();
}
if (className.equals(AllApplicationsActivity.class.getName())) {
mShowSystem = true;
} else if (className.equals(NotificationAppListActivity.class.getName())
if (className.equals(NotificationAppListActivity.class.getName())
|| this instanceof NotificationApps) {
mListType = LIST_TYPE_NOTIFICATION;
mNotifBackend = new NotificationBackend();
@@ -354,7 +368,6 @@ public class ManageApplications extends InstrumentedPreferenceFragment
mResetAppsHelper = new ResetAppsHelper(getActivity());
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {

6
src/com/android/settings/applications/MusicViewHolderController.java → src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
View File

@@ -11,10 +11,10 @@
* 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
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.manageapplications;
import android.app.Fragment;
import android.content.Context;
@@ -36,7 +36,7 @@ import java.io.IOException;
* MusicViewHolderController controls an Audio/Music file view in the ManageApplications view.
*/
public class MusicViewHolderController implements FileViewHolderController {
private static final String TAG = "MusicViewHolderController";
private static final String TAG = "MusicViewHolderCtrl";
private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
private static final int INSET_SIZE = 24; // dp

6
src/com/android/settings/applications/PhotosViewHolderController.java → src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
View File

@@ -11,10 +11,10 @@
* 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
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.manageapplications;
import android.app.Fragment;
import android.content.Context;
@@ -33,7 +33,7 @@ import java.io.IOException;
/** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */
public class PhotosViewHolderController implements FileViewHolderController {
private static final String TAG = "PhotosViewHolderController";
private static final String TAG = "PhotosViewHolderCtrl";
private static final String IMAGE_MIME_TYPE = "image/*";
private static final int INSET_SIZE = 24; // dp

2
src/com/android/settings/applications/ResetAppPrefPreferenceController.java → src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.manageapplications;
import android.content.Context;
import android.os.Bundle;

2
src/com/android/settings/applications/ResetAppsHelper.java → src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.applications;
package com.android.settings.applications.manageapplications;
import static android.net.NetworkPolicyManager.POLICY_NONE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -45,7 +45,7 @@ import com.android.settings.applications.AppAndNotificationDashboardFragment;
import com.android.settings.applications.DrawOverlayDetails;
import com.android.settings.applications.ExternalSourcesDetails;
import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.applications.ManageDomainUrls;
import com.android.settings.applications.NotificationApps;
import com.android.settings.applications.PictureInPictureDetails;

2
src/com/android/settings/development/AppPicker.java
View File

@@ -32,7 +32,7 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import com.android.settings.R;
import com.android.settings.applications.AppViewHolder;
import com.android.settings.applications.manageapplications.AppViewHolder;
import java.text.Collator;
import java.util.ArrayList;

3
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.Fragment;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -57,7 +56,7 @@ import com.android.settings.R;
import com.android.settings.Settings.StorageUseActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.deviceinfo.StorageSettings.MountTask;
import com.android.settingslib.deviceinfo.StorageMeasurement;

2
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -36,7 +36,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;

2
src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;

2
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -56,7 +56,7 @@ import com.android.settings.Settings.HighPowerApplicationsActivity;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.display.AmbientDisplayPreferenceController;

2
src/com/android/settings/search/InstalledAppResultLoader.java
View File

@@ -33,7 +33,7 @@ import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ManageApplications;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.utils.AsyncLoader;
import com.android.settingslib.wrapper.PackageManagerWrapper;

2
src/com/android/settings/system/ResetDashboardFragment.java
View File

@@ -21,7 +21,7 @@ import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.ResetAppPrefPreferenceController;
import com.android.settings.applications.manageapplications.ResetAppPrefPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.NetworkResetPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;