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

Hide the DSULoader when DSU is running

Browse Source 
Bug: 151792130
Test: open developer settings and check the DSULoader
    make -j32 RunSettingsRoboTests
Change-Id: I8f82e0f7ddbfd2c50ac6e2a2d3f61f7715ba452c
This commit is contained in:
Howard Chen
2020-03-19 18:55:55 +08:00
parent 1a84719041
commit 01871ab415
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -11745,6 +11745,8 @@
<string name="dsu_loader_description" translatable="false">Load a Dynamic System Update Image</string> <string name="dsu_loader_description" translatable="false">Load a Dynamic System Update Image</string>
<!-- DSU Loader Loading. Do not translate. --> <!-- DSU Loader Loading. Do not translate. -->
<string name="dsu_loader_loading" translatable="false">Loading...</string> <string name="dsu_loader_loading" translatable="false">Loading...</string>
<!-- DSU Loader. Do not translate. -->
<string name="dsu_is_running" translatable="false">DSU is running</string>
<!-- Name of dev option called "Bug report handler" [CHAR LIMIT=NONE] --> <!-- Name of dev option called "Bug report handler" [CHAR LIMIT=NONE] -->
<string name="bug_report_handler_title">Bug report handler</string> <string name="bug_report_handler_title">Bug report handler</string>

11
src/com/android/settings/development/SelectDSUPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.development;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.SystemProperties;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -37,9 +38,16 @@ class SelectDSUPreferenceController extends DeveloperOptionsPreferenceController
return DSU_LOADER_KEY; return DSU_LOADER_KEY;
} }
private boolean isDSURunning() {
return SystemProperties.getBoolean("ro.gsid.image_running", false);
}
@Override @Override
public boolean handlePreferenceTreeClick(Preference preference) { public boolean handlePreferenceTreeClick(Preference preference) {
if (DSU_LOADER_KEY.equals(preference.getKey())) { if (DSU_LOADER_KEY.equals(preference.getKey())) {
if (isDSURunning()) {
return true;
}
final Intent intent = new Intent(mContext, DSULoader.class); final Intent intent = new Intent(mContext, DSULoader.class);
mContext.startActivity(intent); mContext.startActivity(intent);
return true; return true;
@@ -49,6 +57,7 @@ class SelectDSUPreferenceController extends DeveloperOptionsPreferenceController
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
preference.setSummary(mContext.getResources().getString(R.string.dsu_loader_description)); int key = isDSURunning() ? R.string.dsu_is_running : R.string.dsu_loader_description;
preference.setSummary(mContext.getResources().getString(key));
} }
} }