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

Merge "Update the Manage Storage preference."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-10 22:01:57 +00:00
committed by Android (Google) Code Review
parent a540a978bc abd92e0519
commit f11c16710c
12 changed files with 303 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.deletionhelper;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.FragmentManager;
import android.content.ContentResolver;
import android.content.Intent;
import android.os.Bundle;

41
src/com/android/settings/deviceinfo/ManageStoragePreferenceController.java
View File

@@ -1,41 +0,0 @@
/*
* Copyright (C) 2016 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.deviceinfo;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
public class ManageStoragePreferenceController extends PreferenceController {
public static final String KEY_MANAGE_STORAGE = "manage_storage";
public ManageStoragePreferenceController(Context context) {
super(context);
}
@Override
public String getPreferenceKey() {
return KEY_MANAGE_STORAGE;
}
@Override
public boolean isAvailable() {
return mContext.getResources().getBoolean(R.bool.config_storage_manager_settings_enabled);
}
}

8
src/com/android/settings/deviceinfo/StorageDashboardFragment.java
View File

@@ -35,6 +35,7 @@ import com.android.settings.applications.UserManagerWrapper;
import com.android.settings.applications.UserManagerWrapperImpl;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.deviceinfo.storage.AutomaticStorageManagementSwitchPreferenceController;
import com.android.settings.deviceinfo.storage.SecondaryUserController;
import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
@@ -146,7 +147,11 @@ public class StorageDashboardFragment extends DashboardFragment
mSecondaryUsers = SecondaryUserController.getSecondaryUserControllers(context, userManager);
controllers.addAll(mSecondaryUsers);
controllers.add(new ManageStoragePreferenceController(context));
final AutomaticStorageManagementSwitchPreferenceController asmController =
new AutomaticStorageManagementSwitchPreferenceController(
context, mMetricsFeatureProvider, getFragmentManager());
getLifecycle().addObserver(asmController);
controllers.add(asmController);
return controllers;
}
@@ -189,7 +194,6 @@ public class StorageDashboardFragment extends DashboardFragment
null /* volume */, new StorageManagerVolumeProvider(sm)));
controllers.addAll(SecondaryUserController.getSecondaryUserControllers(
context, userManager));
controllers.add(new ManageStoragePreferenceController(context));
return controllers;
}

100
src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java Normal file
View File

@@ -0,0 +1,100 @@
/**
* Copyright (C) 2017 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.deviceinfo.storage;
import android.app.FragmentManager;
import android.content.Context;
import android.os.SystemProperties;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settings.deletionhelper.ActivationWarningFragment;
import com.android.settings.widget.MasterSwitchController;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settings.widget.SwitchWidgetController;
public class AutomaticStorageManagementSwitchPreferenceController extends PreferenceController
implements LifecycleObserver, OnResume, SwitchWidgetController.OnSwitchChangeListener {
private static final String KEY_TOGGLE_ASM = "toggle_asm";
@VisibleForTesting
static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
private MasterSwitchPreference mSwitch;
private MasterSwitchController mSwitchController;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final FragmentManager mFragmentManager;
public AutomaticStorageManagementSwitchPreferenceController(Context context,
MetricsFeatureProvider metricsFeatureProvider, FragmentManager fragmentManager) {
super(context);
mMetricsFeatureProvider = metricsFeatureProvider;
mFragmentManager = fragmentManager;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mSwitch = (MasterSwitchPreference) screen.findPreference(KEY_TOGGLE_ASM);
}
@Override
public boolean isAvailable() {
return true;
}
@Override
public String getPreferenceKey() {
return KEY_TOGGLE_ASM;
}
@Override
public void onResume() {
boolean isStorageManagerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;
mSwitch.setChecked(isStorageManagerEnabled);
if (mSwitch != null) {
mSwitchController = new MasterSwitchController(mSwitch);
mSwitchController.setListener(this);
mSwitchController.startListening();
}
}
@Override
public boolean onSwitchToggled(boolean isChecked) {
mMetricsFeatureProvider.action(mContext,
MetricsEvent.ACTION_TOGGLE_STORAGE_MANAGER, isChecked);
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
isChecked ? 1 : 0);
boolean storageManagerEnabledByDefault = SystemProperties.getBoolean(
STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false);
if (isChecked && !storageManagerEnabledByDefault) {
ActivationWarningFragment fragment = ActivationWarningFragment.newInstance();
fragment.show(mFragmentManager, ActivationWarningFragment.TAG);
}
return true;
}
}

17
src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
View File

@@ -80,23 +80,6 @@ public class StorageSummaryDonutPreference extends Preference implements View.On
if (deletionHelperButton != null) {
deletionHelperButton.setOnClickListener(this);
}
final TextView storageManagerText =
(TextView) view.findViewById(R.id.storage_manager_indicator);
if (storageManagerText != null) {
Context context = getContext();
final SpannableString templateSs = new SpannableString(
context.getString(R.string.storage_manager_indicator));
boolean isStorageManagerEnabled = Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;
String value = isStorageManagerEnabled ?
context.getString(R.string.storage_manager_indicator_on) :
context.getString(R.string.storage_manager_indicator_off);
Locale locale = storageManagerText.getTextLocale();
final SpannableString ss = new SpannableString(value.toUpperCase(locale));
ss.setSpan(new BoldLinkSpan(), 0, value.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
storageManagerText.setText(TextUtils.expandTemplate(templateSs, ss));
}
}
@Override

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

@@ -17,7 +17,6 @@
package com.android.settings.deviceinfo.storage;
import android.content.Context;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -26,7 +25,6 @@ import android.text.format.Formatter;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
/**