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

Add configs to display/hide a few tiles in device info page

Browse Source 
- Displaying/hiding Emergency info, branded account, device header
  widget are now driven by config flags
- Also refactored controllers to use BasePreferenceController

Change-Id: Ie601ebf689e0744c6a05a2cca5513fa43ef355e0
Fixes: 119607340
Test: robotests
This commit is contained in:
Fan Zhang
2019-01-28 13:10:32 -08:00
parent c2448a1e8c
commit 5c3301b0ab
11 changed files with 100 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
View File

@@ -22,27 +22,25 @@ import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
public class EmergencyInfoPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
public class EmergencyInfoPreferenceController extends BasePreferenceController {
public static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";
private static final String KEY_EMERGENCY_INFO = "emergency_info";
private static final String PACKAGE_NAME_EMERGENCY = "com.android.emergency";
public EmergencyInfoPreferenceController(Context context) {
super(context);
public EmergencyInfoPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
@@ -56,6 +54,7 @@ public class EmergencyInfoPreferenceController extends AbstractPreferenceControl
}
}
@Override
public void updateState(Preference preference) {
UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
UserHandle.myUserId());
@@ -64,7 +63,7 @@ public class EmergencyInfoPreferenceController extends AbstractPreferenceControl
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
if (KEY_EMERGENCY_INFO.equals(preference.getKey())) {
if (TextUtils.equals(getPreferenceKey(), preference.getKey())) {
Intent intent = new Intent(getIntentAction(mContext));
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
mContext.startActivity(intent);
@@ -74,18 +73,19 @@ public class EmergencyInfoPreferenceController extends AbstractPreferenceControl
}
@Override
public boolean isAvailable() {
Intent intent = new Intent(getIntentAction(mContext)).setPackage(getPackageName(mContext));
List<ResolveInfo> infos = mContext.getPackageManager().queryIntentActivities(intent, 0);
return infos != null && !infos.isEmpty();
public int getAvailabilityStatus() {
if (!mContext.getResources().getBoolean(R.bool.config_show_emergency_info_in_device_info)) {
return UNSUPPORTED_ON_DEVICE;
}
final Intent intent = new Intent(getIntentAction(mContext)).setPackage(
getPackageName(mContext));
final List<ResolveInfo> infos = mContext.getPackageManager().queryIntentActivities(intent,
0);
return infos != null && !infos.isEmpty()
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public String getPreferenceKey() {
return KEY_EMERGENCY_INFO;
}
private String getIntentAction(Context context) {
private static String getIntentAction(Context context) {
if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
return context.getResources().getString(R.string.config_emergency_intent_action);
}
@@ -93,7 +93,7 @@ public class EmergencyInfoPreferenceController extends AbstractPreferenceControl
return ACTION_EDIT_EMERGENCY_INFO;
}
private String getPackageName(Context context) {
private static String getPackageName(Context context) {
if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
return context.getResources().getString(R.string.config_emergency_package_name);
}