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

Update the system info dialog.

Browse Source 
The string is updated as well as where the dialog shows up.

Change-Id: If1a3b17dca04fe81f52dbdc2353db34ce7adc49a
Fixes: 34857117
Test: Robotest
This commit is contained in:
Daniel Nishi
2017-03-22 16:12:55 -07:00
parent 34b75da937
commit fda5d5a6a8
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import android.content.pm.IPackageDataObserver;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.UserHandle;
@@ -759,7 +760,8 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
.setMessage(R.string.storage_detail_dialog_system)
.setMessage(getContext().getString(R.string.storage_detail_dialog_system,
Build.VERSION.RELEASE))
.setPositiveButton(android.R.string.ok, null)
.create();
}

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

@@ -35,6 +35,7 @@ import com.android.settings.Utils;
import com.android.settings.applications.ManageApplications;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;
import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.deviceinfo.StorageMeasurement;
@@ -52,6 +53,7 @@ public class StorageItemPreferenceController extends PreferenceController {
private static final String TAG = "StorageItemPreference";
private static final String IMAGE_MIME_TYPE = "image/*";
private static final String SYSTEM_FRAGMENT_TAG = "SystemInfo";
@VisibleForTesting
static final String PHOTO_KEY = "pref_photos_videos";
@@ -104,8 +106,6 @@ public class StorageItemPreferenceController extends PreferenceController {
return false;
}
// TODO: Currently, this reflects the existing behavior for these toggles.
// After the intermediate views are built, swap them in.
Intent intent = null;
if (preference.getKey() == null) {
return false;
@@ -133,6 +133,11 @@ public class StorageItemPreferenceController extends PreferenceController {
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(
mContext, MetricsEvent.STORAGE_FILES);
break;
case SYSTEM_KEY:
final SystemInfoFragment dialog = new SystemInfoFragment();
dialog.setTargetFragment(mFragment, 0);
dialog.show(mFragment.getFragmentManager(), SYSTEM_FRAGMENT_TAG);
return true;
}
if (intent != null) {