Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 11641371 from c35fc38be9 to 24Q3-release

Browse Source 
Change-Id: I6bb15ce11000035cf6fe108c4e4ac458a328c543
This commit is contained in:
Android Build Coastguard Worker
2024-03-28 23:21:10 +00:00
parent c80e465316 c35fc38be9
commit 35dfc9b8d8
14 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/preference_credential_manager_with_buttons.xml
View File

@@ -104,7 +104,7 @@
android:orientation="horizontal"
android:clipToPadding="false"
android:paddingTop="4dp"
android:paddingLeft="80dp"
android:paddingLeft="76dp"
android:paddingBottom="4dp">
<Button

2
res/values/dimens.xml
View File

@@ -477,7 +477,7 @@
<dimen name="animation_max_size">1000dp</dimen>
<!-- Credential Manager settings dimensions -->
<dimen name="credman_primary_provider_pref_left_padding">80dp</dimen>
<dimen name="credman_primary_provider_pref_left_padding">76dp</dimen>
<dimen name="credman_primary_provider_pref_left_padding_compact">24dp</dimen>
<!-- Color contrast screen -->

1
src/com/android/settings/MonitoringCertInfoActivity.java
View File

@@ -117,6 +117,7 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
intent.setPackage(getPackageName());
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.putExtra(TrustedCredentialsSettings.ARG_SHOW_NEW_FOR_USER, mUserId);
startActivity(intent);

3
src/com/android/settings/Utils.java
View File

@@ -1389,7 +1389,8 @@ public final class Utils extends com.android.settingslib.Utils {
ViewCompat.setOnApplyWindowInsetsListener(activity.findViewById(android.R.id.content),
(v, windowInsets) -> {
Insets insets = windowInsets.getInsets(
WindowInsetsCompat.Type.systemBars());
WindowInsetsCompat.Type.systemBars()
| WindowInsetsCompat.Type.ime());
// Apply the insets paddings to the view.
v.setPadding(insets.left, insets.top, insets.right, insets.bottom);

1
src/com/android/settings/inputmethod/KeyboardSettingsPreferenceController.java
View File

@@ -53,6 +53,7 @@ public class KeyboardSettingsPreferenceController extends BasePreferenceControll
for (HardKeyboardDeviceInfo hardKeyboardDeviceInfo : newHardKeyboards) {
if (mCachedDevice.getAddress().equals(hardKeyboardDeviceInfo.mBluetoothAddress)) {
Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS);
intent.setPackage(mContext.getPackageName());
intent.putExtra(
Settings.EXTRA_ENTRYPOINT, SettingsEnums.CONNECTED_DEVICES_SETTINGS);
intent.putExtra(

1
src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
View File

@@ -67,6 +67,7 @@ public class PhysicalKeyboardPreferenceController extends AbstractPreferenceCont
return false;
}
Intent intent = new Intent(Settings.ACTION_HARD_KEYBOARD_SETTINGS);
intent.setPackage(mContext.getPackageName());
intent.putExtra(Settings.EXTRA_ENTRYPOINT, SettingsEnums.KEYBOARD_SETTINGS);
mContext.startActivity(intent);
return true;

3
src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
View File

@@ -191,7 +191,8 @@ public class UserDictionaryListPreferenceController extends BasePreferenceContro
private Preference createUserDictionaryPreference(String locale) {
final String KEY_LOCALE = "locale";
final Preference newPref = new Preference(mScreen.getContext());
final Intent intent = new Intent(USER_DICTIONARY_SETTINGS_INTENT_ACTION);
final Intent intent = new Intent(USER_DICTIONARY_SETTINGS_INTENT_ACTION)
.setPackage(mContext.getPackageName());
if (locale == null) {
newPref.setTitle(Locale.getDefault().getDisplayName());
newPref.setKey(Locale.getDefault().toString());

5
src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java
View File

@@ -118,7 +118,10 @@ public class ZenModeAddBypassingAppsPreferenceController extends AbstractPrefere
return;
}
ApplicationsState.AppFilter filter = ApplicationsState.FILTER_ALL_ENABLED;
ApplicationsState.AppFilter filter = android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
? ApplicationsState.FILTER_ENABLED_NOT_QUIET
: ApplicationsState.FILTER_ALL_ENABLED;
mAppSession.rebuild(filter, ApplicationsState.ALPHA_COMPARATOR);
}

6
src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java
View File

@@ -45,7 +45,6 @@ import com.android.settingslib.widget.AppPreference;
import java.util.ArrayList;
import java.util.List;
/**
* Adds a preference to the PreferenceScreen for each notification channel that can bypass DND.
*/
@@ -107,7 +106,10 @@ public class ZenModeAllBypassingAppsPreferenceController extends AbstractPrefere
return;
}
ApplicationsState.AppFilter filter = ApplicationsState.FILTER_ALL_ENABLED;
ApplicationsState.AppFilter filter = android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
? ApplicationsState.FILTER_ENABLED_NOT_QUIET
: ApplicationsState.FILTER_ALL_ENABLED;
mAppSession.rebuild(filter, ApplicationsState.ALPHA_COMPARATOR);
}

5
src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
View File

@@ -82,7 +82,10 @@ public class ZenModeBypassingAppsPreferenceController extends AbstractZenModePre
return;
}
ApplicationsState.AppFilter filter = ApplicationsState.FILTER_ALL_ENABLED;
ApplicationsState.AppFilter filter = android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
? ApplicationsState.FILTER_ENABLED_NOT_QUIET
: ApplicationsState.FILTER_ALL_ENABLED;
List<ApplicationsState.AppEntry> apps = mAppSession.rebuild(filter,
ApplicationsState.ALPHA_COMPARATOR);
updateAppsBypassingDndSummaryText(apps);

2
src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.privatespace;
import static android.text.Layout.BREAK_STRATEGY_SIMPLE;
import static android.view.View.ACCESSIBILITY_LIVE_REGION_POLITE;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -130,6 +131,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
inflater.inflate(R.layout.private_space_advancing_screen, container, false);
mRootView.getHeaderTextView().setMaxLines(HEADER_TEXT_MAX_LINES);
mRootView.getHeaderTextView().setBreakStrategy(BREAK_STRATEGY_SIMPLE);
mRootView.getHeaderTextView().setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_POLITE);
updateHeaderAndIllustration();
mHandler = new Handler(Looper.getMainLooper());
mHandler.postDelayed(mUpdateScreenResources, DELAY_BETWEEN_SCREENS);

1
src/com/android/settings/security/CredentialStorage.java
View File

@@ -139,6 +139,7 @@ public final class CredentialStorage extends FragmentActivity {
}
final Intent installIntent = new Intent(ACTION_INSTALL)
.setPackage(getPackageName())
.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
.putExtras(bundle);
startActivityAsUser(installIntent, new UserHandle(dstUserId));

3
src/com/android/settings/security/InstallCaCertificateWarning.java
View File

@@ -41,6 +41,8 @@ import com.google.android.setupdesign.util.ThemeHelper;
*/
public class InstallCaCertificateWarning extends Activity {
private static final String CERT_INSTALLER_PACKAGE_NAME = "com.android.certinstaller";
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -79,6 +81,7 @@ public class InstallCaCertificateWarning extends Activity {
return v -> {
final Intent intent = new Intent();
intent.setAction(Credentials.INSTALL_ACTION);
intent.setPackage(CERT_INSTALLER_PACKAGE_NAME);
intent.putExtra(Credentials.EXTRA_CERTIFICATE_USAGE, Credentials.CERTIFICATE_USAGE_CA);
startActivity(intent);
finish();

3
tests/robotests/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceControllerTest.java
View File

@@ -162,4 +162,7 @@ public class ZenModeAddBypassingAppsPreferenceControllerTest {
assertThat(pref.getKey()).isEqualTo(
ZenModeAddBypassingAppsPreferenceController.KEY_NO_APPS);
}
// TODO(b/331624810): Add tests to verify updateAppList() when the filter is
// ApplicationsState.FILTER_ENABLED_NOT_QUIET
}