Fixes UI style issues in Screen Timeout setting
1. Remove help url and search icon. 2. Uses BannerMessage for permission missing notification. Test: manual Bug: 182297705 Change-Id: Id4dc998d7276f4c4f7593b1b0312d92097ec83cf
This commit is contained in:
@@ -2836,7 +2836,9 @@
|
|||||||
<!-- adaptive_sleep settings screen, title about the required permission is missing [CHAR LIMIT=NONE]-->
|
<!-- adaptive_sleep settings screen, title about the required permission is missing [CHAR LIMIT=NONE]-->
|
||||||
<string name="adaptive_sleep_title_no_permission">Camera access needed</string>
|
<string name="adaptive_sleep_title_no_permission">Camera access needed</string>
|
||||||
<!-- adaptive_sleep settings screen, subtitle when permission is missing [CHAR LIMIT=NONE]-->
|
<!-- adaptive_sleep settings screen, subtitle when permission is missing [CHAR LIMIT=NONE]-->
|
||||||
<string name="adaptive_sleep_summary_no_permission">Tap to manage permissions for Device Personalization Services</string>
|
<string name="adaptive_sleep_summary_no_permission">Camera access is required for screen attention. Tap to manage permissions for Device Personalization Services</string>
|
||||||
|
<!-- adaptive_sleep settings screen, text for the camera permission button [CHAR LIMIT=NONE]-->
|
||||||
|
<string name="adaptive_sleep_manage_permission_button">Manage permissions</string>
|
||||||
<!-- Description about the feature adaptive sleep [CHAR LIMIT=NONE]-->
|
<!-- Description about the feature adaptive sleep [CHAR LIMIT=NONE]-->
|
||||||
<string name="adaptive_sleep_description">Prevents your screen from turning off if you\u2019re looking at it</string>
|
<string name="adaptive_sleep_description">Prevents your screen from turning off if you\u2019re looking at it</string>
|
||||||
<!-- Description feature's privacy sensitive details to make sure users understand what feature users, what it saves/sends etc [CHAR LIMIT=NONE]-->
|
<!-- Description feature's privacy sensitive details to make sure users understand what feature users, what it saves/sends etc [CHAR LIMIT=NONE]-->
|
||||||
|
@@ -23,11 +23,11 @@ import android.content.Intent;
|
|||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
|
||||||
import androidx.preference.Preference;
|
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
import com.android.internal.annotations.VisibleForTesting;
|
import com.android.internal.annotations.VisibleForTesting;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settingslib.widget.BannerMessagePreference;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The controller of Screen attention's permission warning preference. The preference appears when
|
* The controller of Screen attention's permission warning preference. The preference appears when
|
||||||
@@ -35,8 +35,8 @@ import com.android.settings.R;
|
|||||||
*/
|
*/
|
||||||
public class AdaptiveSleepPermissionPreferenceController {
|
public class AdaptiveSleepPermissionPreferenceController {
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
Preference mPreference;
|
BannerMessagePreference mPreference;
|
||||||
private PackageManager mPackageManager;
|
private final PackageManager mPackageManager;
|
||||||
|
|
||||||
public AdaptiveSleepPermissionPreferenceController(Context context) {
|
public AdaptiveSleepPermissionPreferenceController(Context context) {
|
||||||
final String packageName = context.getPackageManager().getAttentionServicePackageName();
|
final String packageName = context.getPackageManager().getAttentionServicePackageName();
|
||||||
@@ -44,13 +44,12 @@ public class AdaptiveSleepPermissionPreferenceController {
|
|||||||
final Intent intent = new Intent(
|
final Intent intent = new Intent(
|
||||||
android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
|
android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
|
||||||
intent.setData(Uri.parse("package:" + packageName));
|
intent.setData(Uri.parse("package:" + packageName));
|
||||||
mPreference = new Preference(context);
|
mPreference = new BannerMessagePreference(context);
|
||||||
mPreference.setTitle(R.string.adaptive_sleep_title_no_permission);
|
mPreference.setTitle(R.string.adaptive_sleep_title_no_permission);
|
||||||
mPreference.setSummary(R.string.adaptive_sleep_summary_no_permission);
|
mPreference.setSummary(R.string.adaptive_sleep_summary_no_permission);
|
||||||
mPreference.setIcon(R.drawable.ic_info_outline_24);
|
mPreference.setPositiveButtonText(R.string.adaptive_sleep_manage_permission_button);
|
||||||
mPreference.setOnPreferenceClickListener(p -> {
|
mPreference.setPositiveButtonOnClickListener(p -> {
|
||||||
context.startActivity(intent);
|
context.startActivity(intent);
|
||||||
return true;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -23,7 +23,6 @@ import android.app.settings.SettingsEnums;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.text.SpannableString;
|
import android.text.SpannableString;
|
||||||
@@ -39,8 +38,6 @@ import androidx.preference.PreferenceScreen;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settings.search.actionbar.SearchMenuController;
|
|
||||||
import com.android.settings.support.actionbar.HelpMenuController;
|
|
||||||
import com.android.settings.support.actionbar.HelpResourceProvider;
|
import com.android.settings.support.actionbar.HelpResourceProvider;
|
||||||
import com.android.settings.widget.RadioButtonPickerFragment;
|
import com.android.settings.widget.RadioButtonPickerFragment;
|
||||||
import com.android.settingslib.RestrictedLockUtils;
|
import com.android.settingslib.RestrictedLockUtils;
|
||||||
@@ -91,13 +88,6 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
|
|||||||
.getMetricsFeatureProvider();
|
.getMetricsFeatureProvider();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle icicle) {
|
|
||||||
super.onCreate(icicle);
|
|
||||||
SearchMenuController.init(this /* host */);
|
|
||||||
HelpMenuController.init(this /* host */);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onAttach(Context context) {
|
public void onAttach(Context context) {
|
||||||
super.onAttach(context);
|
super.onAttach(context);
|
||||||
|
Reference in New Issue
Block a user