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

Move the permission warning message to corresponding layout file.

Browse Source 
Bug: 129284701
Test: Manually verified
Test: atest AdaptiveSleepPermissionPreferenceController

Change-Id: Ic31bdb37f751288ae6dcd1253d56806c767e2e47
This commit is contained in:
Yi Jiang
2019-06-11 19:30:34 -07:00
parent a05cb731e7
commit 336b0c23c5
5 changed files with 103 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/com/android/settings/display/AdaptiveSleepSettings.java
View File

@@ -16,21 +16,16 @@
package com.android.settings.display;
import static com.android.settings.display.AdaptiveSleepPreferenceController.hasSufficientPermission;
import static com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice.PREF;
import static com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice.PREF_KEY_INTERACTED;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -45,11 +40,6 @@ public class AdaptiveSleepSettings extends DashboardFragment {
private static final String TAG = "AdaptiveSleepSettings";
private Context mContext;
private String mPackageName;
private PackageManager mPackageManager;
@VisibleForTesting
Preference mPermissionRequiredPreference;
@Override
public void onCreate(Bundle icicle) {
@@ -57,32 +47,22 @@ public class AdaptiveSleepSettings extends DashboardFragment {
final FooterPreference footerPreference =
mFooterPreferenceMixin.createFooterPreference();
mContext = getContext();
mPermissionRequiredPreference = createPermissionMissionPreference();
footerPreference.setIcon(R.drawable.ic_privacy_shield_24dp);
footerPreference.setTitle(R.string.adaptive_sleep_privacy);
getPreferenceScreen().addPreference(mPermissionRequiredPreference);
mPermissionRequiredPreference.setVisible(false);
mPackageManager = mContext.getPackageManager();
mPackageName = mPackageManager.getAttentionServicePackageName();
Preference permissionPreference = findPreference(
AdaptiveSleepPermissionPreferenceController.PREF_NAME);
if (permissionPreference != null) {
permissionPreference.setVisible(false);
}
mContext.getSharedPreferences(PREF, Context.MODE_PRIVATE)
.edit()
.putBoolean(PREF_KEY_INTERACTED, true)
.apply();
}
@Override
public void onResume() {
super.onResume();
if (!hasSufficientPermission(mPackageManager)) {
mPermissionRequiredPreference.setVisible(true);
}
else {
mPermissionRequiredPreference.setVisible(false);
}
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.adaptive_sleep_detail;
@@ -113,29 +93,4 @@ public class AdaptiveSleepSettings extends DashboardFragment {
return Arrays.asList(sir);
}
};
private Preference createPermissionMissionPreference() {
Preference preference = new Preference(mContext, null);
preference.setIcon(R.drawable.ic_info_outline_24);
// Makes sure it's above the toggle.
preference.setOrder(1);
preference.setPersistent(true);
preference.setTitle(R.string.adaptive_sleep_title_no_permission);
preference.setSummary(R.string.adaptive_sleep_summary_no_permission);
preference.setOnPreferenceClickListener(p -> {
final Intent intent = new Intent(
android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.parse("package:" + mPackageName));
mContext.startActivity(intent);
return true;
});
return preference;
}
@VisibleForTesting
void setupForTesting(PackageManager packageManager, Context context) {
mContext = context;
mPackageManager = packageManager;
mPermissionRequiredPreference = createPermissionMissionPreference();
}
}