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

Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-11 19:13:45 +00:00
committed by Android (Google) Code Review
parent a5715f7d9c c26745207d
commit 9fb76d02bb
5 changed files with 148 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java
View File

@@ -21,8 +21,11 @@ import android.content.Context;
import androidx.preference.Preference;
public class AdaptiveSleepDetailPreferenceController extends AdaptiveSleepPreferenceController {
private final Context mContext;
public AdaptiveSleepDetailPreferenceController(Context context, String key) {
super(context, key);
mContext = context;
}
@Override
@@ -42,6 +45,7 @@ public class AdaptiveSleepDetailPreferenceController extends AdaptiveSleepPrefer
@Override
public void updateState(Preference preference) {
super.updateState(preference);
preference.setEnabled(super.hasSufficientPermissions);
preference.setEnabled(AdaptiveSleepPreferenceController.hasSufficientPermission(
mContext.getPackageManager()));
}
}
}

4
src/com/android/settings/display/AdaptiveSleepPreferenceController.java
View File

@@ -29,7 +29,7 @@ public class AdaptiveSleepPreferenceController extends TogglePreferenceControlle
private static final String SYSTEM_KEY = ADAPTIVE_SLEEP;
private static final int DEFAULT_VALUE = 0;
final boolean hasSufficientPermissions;
private final boolean hasSufficientPermissions;
public AdaptiveSleepPreferenceController(Context context, String key) {
super(context, key);
@@ -71,7 +71,7 @@ public class AdaptiveSleepPreferenceController extends TogglePreferenceControlle
: UNSUPPORTED_ON_DEVICE;
}
private static boolean hasSufficientPermission(PackageManager packageManager) {
static boolean hasSufficientPermission(PackageManager packageManager) {
final String attentionPackage = packageManager.getAttentionServicePackageName();
return attentionPackage != null && packageManager.checkPermission(
Manifest.permission.CAMERA, attentionPackage) == PackageManager.PERMISSION_GRANTED;

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

@@ -16,16 +16,21 @@
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.SharedPreferences;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.util.Log;
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;
@@ -39,23 +44,45 @@ import java.util.List;
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) {
super.onCreate(icicle);
final FooterPreference footerPreference =
mFooterPreferenceMixin.createFooterPreference();
final Context context = getContext();
mContext = getContext();
mPermissionRequiredPreference = createPermissionMissionPreference();
footerPreference.setIcon(R.drawable.ic_privacy_shield_24dp);
footerPreference.setTitle(R.string.adaptive_sleep_privacy);
context.getSharedPreferences(PREF, Context.MODE_PRIVATE)
getPreferenceScreen().addPreference(mPermissionRequiredPreference);
mPermissionRequiredPreference.setVisible(false);
mPackageManager = mContext.getPackageManager();
mPackageName = mPackageManager.getAttentionServicePackageName();
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;
@@ -86,4 +113,29 @@ 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();
}
}