Commit Graph

51156 Commits

Author SHA1 Message Date
Joy Babafemi
45c932f9a6 Merge "Set ACTION_REQUEST_SET_AUTOFILL_SERVICE to route to DefaultCombinedActivity" into main 2023-10-04 18:12:21 +00:00
Hakjun Choi
5e8e07ce7c Merge "Changed API name from 'isNtn()' to 'isOnlyNonTerrestrialNetwork()' and updated related methods and variables according to API Council recommendations." into main 2023-10-04 17:35:54 +00:00
Matt Pietal
9695477373 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f am: 8d4d73f152 am: 9e233f3284 am: 84076896f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: I361b6926ca06f22211048ad5738b58d3bf21c473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 16:57:42 +00:00
Matt Pietal
84076896f6 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f am: 8d4d73f152 am: 9e233f3284
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: I91198eb53fda60d1f5801e5fa8512be2800304e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 16:26:27 +00:00
Matt Pietal
9e233f3284 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f am: 8d4d73f152
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: I9a436c40d689ad4db65a9ff9def5ea04c8115894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 15:55:50 +00:00
Matt Pietal
8d4d73f152 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Icf1ee16bfff74c784b67417dec19f56caf2fd6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 15:23:35 +00:00
Matt Pietal
705507d68f Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 14:54:22 +00:00
Matt Pietal
3be411d513 Merge "Add support to configure double line clock in lockscreen [2/2]" into main 2023-10-04 14:25:38 +00:00
Graciela Putri
f861f64769 Merge "Update aspect ratio summary strings" into udc-qpr-dev am: 242bde10c8 am: fafb4bf5ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24867213

Change-Id: I169898d72e09964a762726782acfe57906468608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 14:03:45 +00:00
Graciela Putri
74849c1458 Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0 am: 112b5765e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381

Change-Id: I03e18dc136080e77054f42452b4ad928fd2a8a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 14:03:32 +00:00
Graciela Putri
fafb4bf5ba Merge "Update aspect ratio summary strings" into udc-qpr-dev am: 242bde10c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24867213

Change-Id: I4e6ef486029a3f70cf7c267320c200c19384787a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 13:32:50 +00:00
Graciela Putri
112b5765e0 Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381

Change-Id: I6ad5d7d6d9972dca2e42462440648e90f09b28e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 13:32:33 +00:00
Graciela Putri
242bde10c8 Merge "Update aspect ratio summary strings" into udc-qpr-dev 2023-10-04 13:04:36 +00:00
Hakjun Choi
aa911b312b Changed API name from 'isNtn()' to 'isOnlyNonTerrestrialNetwork()' and updated related methods and variables according to API Council recommendations.
isNtn() -> isOnlyNonTerrestrialNetwork()
No changes in logic.

Bug: 301620244
Test: PreferredSimDialogFragmentTest SimListDialogFragmentTest
Change-Id: I2b64262ed4d9f81f830f76b10a2174ad1e1d649f
2023-10-04 08:23:30 +00:00
Graciela Wissen Putri
e08d0f88d3 Add warning text to Aspect ratio app info header
Settings > Apps > App info > Aspect ratio

Fix: 301440671
Test: Manual
Change-Id: I1d24a38c37cfb95e5711308c96f1fc8da91d5e53
2023-10-03 14:34:18 +00:00
josephpv
1e5c7aea0b Hide settings app for private profile from launcher.
Bug: 296994499
Test: Manually verifed that settings app is not shown for Private Profile from launcher.
Change-Id: Ie8c328eacbd0f42772562f10026ced78d095956f
2023-10-03 11:33:54 +00:00
Treehugger Robot
4cc92858f4 Merge "Config battery info page(1/2)" into main 2023-10-03 08:53:01 +00:00
Treehugger Robot
094a73867c Merge "Fix missing declared accessibility PreferenceControllers." into main 2023-10-03 08:22:02 +00:00
Zoey Chen
6a3352e7a0 Merge "[ToA] Terms of Address UI, fragment in LocaleListPicker" into main 2023-10-03 07:46:49 +00:00
Wesley Wang
bace563189 Config battery info page(1/2)
- Make battery information page configurable

Bug: 301817717
Test: make SettingsRoboTests
Change-Id: I51bf00fe3d9993ecd4e8481cd7c15d70b3c09ec4
2023-10-03 07:36:52 +00:00
YK Hung
3be5135a01 Merge "Refactor Power Usage Time Page." into main 2023-10-03 06:55:07 +00:00
Zoey Chen
c2522b8f9d [ToA] Terms of Address UI, fragment in LocaleListPicker
Test: atest TermsOfAddressCategoryControllerTest
Test: adb shell device_config put settings_globalintl com.android.settings.flags.terms_of_address_enabled true
Bug: 295826542
Bug: 297798866
Change-Id: I2b9af7cbe7cab0bb7b2168bc99f0fa7bc0903ac2
2023-10-03 06:36:05 +00:00
Allen Su
1c2440aab0 Merge "Fix notificaiton not working in work profile" into main 2023-10-03 02:11:34 +00:00
Joy Babafemi
9b2cd85ae1 Set ACTION_REQUEST_SET_AUTOFILL_SERVICE to route to
DefaultCombinedActivity

Bug: 181274232
Change-Id: I382dc159aa785ce592211f9071f822e43ff582ae
2023-10-03 00:03:08 +00:00
Daniel Norman
35265e838f Fix missing declared accessibility PreferenceControllers.
This includes 3 fixes:

Adds missing settings:controller attribute for bold & high-contrast
text preferences.

Separates VibrationSettings into two fragments, one per fragment XML resource.
  Instead of using a conditional to choose the XML resource ID,
  we now use the conditional to choose which fragment to launch.
  This allows both fragment's preference controllers to be inspected
  by CodeInspectionTest#runSliceControllerInXmlInspection.
  Also updates the preference keys which must be unique per XML in order
  to appear in Settings Search.

Adds Magnification preference controllers to exempt-not-in-XML list.
  These controllers are for fragments that are not declared in an XML.
  See ToggleScreenMagnificationPreferenceFragment
        #getPreferenceScreenResId.

Bug: 289967175
Test: atest SettingsRoboTests:com.android.settings.accessibility
Test: atest CodeInspectionTest#runSliceControllerInXmlInspection;
      Observe no errors in the accessibility package.
Test: Open Settings > Accessibility > Vibration & haptics;
      observe vibration intensity page is shown (behavior unchanged).
      Hardcode config_vibration_supported_intensity_levels=1;
      observe vibration page with toggles is shown (behavior unchanged).
Change-Id: I257b5ad390371bedb1623af6289016b06d478707
2023-10-02 18:00:30 +00:00
Shivangi Dubey
097a9e736c Merge "Disable Fold lock behavior setting by default" into main 2023-10-02 10:00:10 +00:00
Allen Su
7b31a7a612 Fix notificaiton not working in work profile
Bug: 298592379
Test: atest SettingsRoboTests:com.android.settings.localepicker
Change-Id: I1da93e0dd2a7f98c2e635a1d7a520c88ba8258e0
2023-10-02 09:34:40 +00:00
mxyyiyi
1b9eb170dd Refactor Power Usage Time Page.
- Show use time category

Screenshot:
[Screen time with hint] https://screenshot.googleplex.com/3cRLrwevzw4iytb
[Background time with hint] https://screenshot.googleplex.com/zEf8PcWopCVCRZR
[without hint] https://screenshot.googleplex.com/9bao9sVd8s7VRwM
[enter from app info (without category)] https://screenshot.googleplex.com/8sozxMrq8ojadiF

Bug: 302063050
Test: Manual
Change-Id: Ic967d05a173afa76c2a958e1332dedd9f83cd687
2023-10-02 02:34:35 +08:00
Hao Dong
d11b9d1647 Merge "Use shared lib for settings v2." into main 2023-09-30 17:25:52 +00:00
Valentin Iftime
68916a9bbf Check for NameNotFoundException when querying for PackageInfo
PackageManager.getPackageInfo will throw NameNotFoundException if package was/is being removed.

Test: atest FullScreenIntentPermissionPreferenceControllerTest
Bug: 296163845
Change-Id: I3242ac7e68fa7ed99fe99c7de7cd97aaf87948ee
2023-09-29 11:17:00 +02:00
YK Hung
a191396363 Merge "Fix anomalyEventId metrices action." into main 2023-09-29 06:31:24 +00:00
Sudheer Shanka
8af457e732 Merge "Provide SuspendDialogInfo when quarantining an app." into main 2023-09-28 20:20:46 +00:00
Hao Dong
ae40494ee6 Use shared lib for settings v2.
Test: settingsv2 tests passed
Bug: 302372183

Change-Id: I6d1b20853b26662c538e804b1191bb720f1d7b8f
2023-09-28 19:16:11 +00:00
Zoey Chen
60d3f7b7d2 Merge "[ToA] Terms of Address UI, fragment and the list: - Feminine, Masculine, Neutral, Not Specified" into main 2023-09-28 17:00:49 +00:00
Sudheer Shanka
b5441bf782 Provide SuspendDialogInfo when quarantining an app.
Customize the dialog to include a button to allow
users to take an app out of the quarantine state.

Bug: 297934650
Test: atest tests/robotests/src/com/android/settings/development/quarantine/QuarantinedAppsScreenControllerTest.java
Change-Id: I1b6e9f057fed91ae131602fd6d6ddf5e23958a65
2023-09-28 14:48:15 +00:00
Eghosa Ewansiha-Vlachavas
5f624b70ba Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev am: a3108d5b14 am: 2595f32076
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24854937

Change-Id: Iaa9687110887498c26d246dfed086eb1f8d529af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 12:13:01 +00:00
Eghosa Ewansiha-Vlachavas
2595f32076 Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev am: a3108d5b14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24854937

Change-Id: I9ed3cf613ae4b20c1465403be0c989a00be425fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 11:08:02 +00:00
Eghosa Ewansiha-Vlachavas
a3108d5b14 Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev 2023-09-28 10:39:35 +00:00
mxyyiyi
2385e3a714 Fix anomalyEventId metrices action.
Bug: 302251479
Fix: 302251479
Test: manual
Change-Id: Ia1a17f8c69dfe6673a122aa4f1c662d4617dc78f
2023-09-28 15:47:41 +08:00
Treehugger Robot
747d86fef5 Merge "Fix & ignore some tests" into main 2023-09-28 07:41:13 +00:00
Chaohui Wang
58871ff999 Merge "Improve the latency of DataUsageList" into main 2023-09-28 03:18:38 +00:00
Zoey Chen
b501ab183e [ToA] Terms of Address UI, fragment and the list:
- Feminine, Masculine, Neutral, Not Specified

Test: atest TermsOfAddressNotSpecifiedControllerTest, atest
TermsOfAddressNeutralControllerTest, atest
TermsOfAddressMasculineControllerTest, atest TermsOfAddressFeminineControllerTest
Bug: 295826542
Bug: 297798866
Change-Id: I490ace0035c809cac47bae460f558f13875ff18f
2023-09-28 02:23:57 +00:00
Xin Li
f0ba9c8b60 Merge UP1A.231005.007
Bug: 291102124
Merged-In: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
Change-Id: If0cc9b99ea3e0e6d908d8c1ed476232d3056cb5d
2023-09-27 16:05:12 -07:00
Eghosa Ewansiha-Vlachavas
6bd9bff2e2 [1/n] Aspect ratio settings app list refinement
All apps list for work profile currently only shows work apps that are
also installed on the normal user. Update filter for list to show all
launcher apps for both users in their respective lists.

Fixes: 301373413
Test: atest SettingsUnitTests:UserAspectRatioManagerTest
Test: atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Ia0bf15340d1b37dcd926d81598d3e94f448a46fc
2023-09-27 17:30:23 +00:00
Chaohui Wang
9b4db8d33f Fix & ignore some tests
Fix the followings,
- SimSelectNotificationTest
- WifiCallingSliceHelperTest
- WifiDetailPreferenceController2Test
- WifiDialogActivityTest

Ignore the followings,
- WifiP2pSettingsTest

Fix: 300160894
Test: robo test
Change-Id: I27b6eb61dccbd0688a100154fc77b82a91eede57
2023-09-27 23:45:48 +08:00
Treehugger Robot
53142da077 Merge "Use profile badge without background for notification history" into main 2023-09-27 13:41:12 +00:00
Valentin Iftime
37b3b9b1db Use profile badge without background for notification history
Use the no-brackground work profile badge for notification history list items.

Test: manual
Bug: 291974306
Change-Id: I4c75267be1090cda03de2bc3fdcfc19fc398a223
2023-09-27 14:43:24 +02:00
Haijie Hong
1ebf64c059 Merge "Fix scrolling to wrong position issue in Bluetooth Device Details page" into main 2023-09-27 09:43:45 +00:00
Treehugger Robot
2954c150ef Merge "Add SettingsTextFieldPassword." into main 2023-09-27 09:24:47 +00:00
Haijie Hong
c2694e1ff6 Fix scrolling to wrong position issue in Bluetooth Device Details page
Bug: 294355795
Test: tested locally
Change-Id: Ic80fb7974cf30adb3112aeb826c2b5bcb0067afc
2023-09-27 08:34:37 +00:00