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

Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f am: 6c7910557e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460

Change-Id: I734695139164190b049052af8456dfb8127202d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-22 03:52:37 +00:00
committed by Automerger Merge Worker
parent 407560fde4 6c7910557e
commit f4b81c8207
10 changed files with 407 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/display/ControlsPrivacyPreferenceController.java
View File

@@ -62,6 +62,11 @@ public class ControlsPrivacyPreferenceController extends TogglePreferenceControl
@Override
public int getAvailabilityStatus() {
// hide if we should use customizable lock screen quick affordances
if (CustomizableLockScreenUtils.isFeatureEnabled(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
// hide if lockscreen isn't secure for this user
return isEnabled() && isSecure() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}

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

@@ -70,6 +70,10 @@ public class ControlsTrivialPrivacyPreferenceController extends TogglePreference
@Override
public int getAvailabilityStatus() {
if (CustomizableLockScreenUtils.isFeatureEnabled(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
return showDeviceControlsSettingsEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}

71
src/com/android/settings/display/CustomizableLockScreenQuickAffordancesPreferenceController.java Normal file
View File

@@ -0,0 +1,71 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.display;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
/**
* Preference for accessing an experience to customize lock screen quick affordances.
*/
public class CustomizableLockScreenQuickAffordancesPreferenceController extends
BasePreferenceController implements PreferenceControllerMixin {
public CustomizableLockScreenQuickAffordancesPreferenceController(Context context, String key) {
super(context, key);
}
@Override
public int getAvailabilityStatus() {
return CustomizableLockScreenUtils.isFeatureEnabled(mContext)
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
final Preference preference = screen.findPreference(getPreferenceKey());
if (preference != null) {
preference.setOnPreferenceClickListener(preference1 -> {
// TODO(b/258471384): open the buttons destination within wallpaper picker.
final Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER);
final String packageName =
mContext.getString(R.string.config_wallpaper_picker_package);
if (!TextUtils.isEmpty(packageName)) {
intent.setPackage(packageName);
}
mContext.startActivity(intent);
return true;
});
refreshSummary(preference);
}
}
@Override
public CharSequence getSummary() {
return CustomizableLockScreenUtils.getQuickAffordanceSummary(mContext);
}
}

152
src/com/android/settings/display/CustomizableLockScreenUtils.java Normal file
View File

@@ -0,0 +1,152 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.display;
import android.content.ContentResolver;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import java.util.ArrayList;
import java.util.List;
/** Utilities for display settings related to customizable lock screen features. */
public final class CustomizableLockScreenUtils {
private static final String TAG = "CustomizableLockScreenUtils";
private static final Uri BASE_URI = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority("com.android.systemui.keyguard.quickaffordance")
.build();
@VisibleForTesting
static final Uri FLAGS_URI = BASE_URI.buildUpon()
.path("flags")
.build();
@VisibleForTesting
static final Uri SELECTIONS_URI = BASE_URI.buildUpon()
.path("selections")
.build();
@VisibleForTesting
static final String NAME = "name";
@VisibleForTesting
static final String VALUE = "value";
@VisibleForTesting
static final String ENABLED_FLAG = "is_feature_enabled";
@VisibleForTesting
static final String AFFORDANCE_NAME = "affordance_name";
private CustomizableLockScreenUtils() {}
/**
* Queries and returns whether the customizable lock screen quick affordances feature is enabled
* on the device.
*
* <p>This is a slow, blocking call that shouldn't be made on the main thread.
*/
public static boolean isFeatureEnabled(Context context) {
try (Cursor cursor = context.getContentResolver().query(
FLAGS_URI,
null,
null,
null)) {
if (cursor == null) {
Log.w(TAG, "Cursor was null!");
return false;
}
final int indexOfNameColumn = cursor.getColumnIndex(NAME);
final int indexOfValueColumn = cursor.getColumnIndex(VALUE);
if (indexOfNameColumn == -1 || indexOfValueColumn == -1) {
Log.w(TAG, "Cursor doesn't contain " + NAME + " or " + VALUE + "!");
return false;
}
while (cursor.moveToNext()) {
final String name = cursor.getString(indexOfNameColumn);
final int value = cursor.getInt(indexOfValueColumn);
if (TextUtils.equals(ENABLED_FLAG, name)) {
Log.d(TAG, ENABLED_FLAG + "=" + value);
return value == 1;
}
}
Log.w(TAG, "Flag with name \"" + ENABLED_FLAG + "\" not found!");
return false;
} catch (Exception e) {
Log.e(TAG, "Exception while querying quick affordance content provider", e);
return false;
}
}
/**
* Queries and returns a summary text for the currently-selected lock screen quick affordances.
*
* <p>This is a slow, blocking call that shouldn't be made on the main thread.
*/
@Nullable
public static CharSequence getQuickAffordanceSummary(Context context) {
try (Cursor cursor = context.getContentResolver().query(
SELECTIONS_URI,
null,
null,
null)) {
if (cursor == null) {
Log.w(TAG, "Cursor was null!");
return null;
}
final int columnIndex = cursor.getColumnIndex(AFFORDANCE_NAME);
if (columnIndex == -1) {
Log.w(TAG, "Cursor doesn't contain \"" + AFFORDANCE_NAME + "\" column!");
return null;
}
final List<String> affordanceNames = new ArrayList<>(cursor.getCount());
while (cursor.moveToNext()) {
final String affordanceName = cursor.getString(columnIndex);
if (!TextUtils.isEmpty(affordanceName)) {
affordanceNames.add(affordanceName);
}
}
// We don't display more than the first two items.
final int usableAffordanceNameCount = Math.min(2, affordanceNames.size());
final List<String> arguments = new ArrayList<>(usableAffordanceNameCount);
if (!affordanceNames.isEmpty()) {
arguments.add(affordanceNames.get(0));
}
if (affordanceNames.size() > 1) {
arguments.add(affordanceNames.get(1));
}
return context.getResources().getQuantityString(
R.plurals.lockscreen_quick_affordances_summary,
usableAffordanceNameCount,
arguments.toArray());
} catch (Exception e) {
Log.e(TAG, "Exception while querying quick affordance content provider", e);
return null;
}
}
}

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

@@ -87,6 +87,10 @@ public class QRCodeScannerPreferenceController extends TogglePreferenceControlle
@Override
public int getAvailabilityStatus() {
if (CustomizableLockScreenUtils.isFeatureEnabled(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
return isScannerActivityAvailable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}

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

@@ -62,6 +62,10 @@ public class WalletPrivacyPreferenceController extends TogglePreferenceControlle
@Override
public int getAvailabilityStatus() {
if (CustomizableLockScreenUtils.isFeatureEnabled(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
return isEnabled() && isSecure() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}