Gil Cukierman
02ef8722be
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
am: ccfd44162f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I22634f05290d7c86c79e804b15a0db29d807911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 17:50:11 +00:00
Gil Cukierman
ccfd44162f
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 16:12:54 +00:00
Gil Cukierman
4429054bb1
Use AAPT2 For SettingsUnitTests
...
Forces tradefed to use aapt2 for SettingsUnitTests to get around
the issue of Settings.apk not being parseable by aapt.
Bug: 247779071
Test: atest SettingsUnitTests
Change-Id: I8af260f8d2c438512d3e61f0028accf7b40c8a00
2022-09-21 17:48:20 +00:00
TreeHugger Robot
2f40a918e1
Merge "Update App battery usage page and add tests." into tm-qpr-dev am: 50c7cb834e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19951824
Change-Id: I680de6c08f5a1533779f4c73ff1bd3f7cd8ad0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-16 08:37:40 +00:00
Tiffany Nguyen
99d3b54a70
Update App battery usage page and add tests.
...
- Add tests
- Remove duplicated "Set battery usage for apps" text
- Clean up some code
Screenshot: https://screenshot.googleplex.com/8LHhyxFA6X4ZFkT.png
Test: make RunSettingsRoboTests -j40
Bug: 244995036
Change-Id: Iaac9b0af10f541100e91b10affacf3307bd5edca
2022-09-15 13:40:12 +00:00
Tiffany Nguyen
3fa60efb6c
Add Apps > Battery optimization page implementation. am: 6147e0fa5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19726219
Change-Id: I3498f3c1482acf6ece57bd1297bffd9c08d81c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-05 04:04:13 +00:00
Tiffany Nguyen
6147e0fa5c
Add Apps > Battery optimization page implementation.
...
Moving the old restricted page to the new optimization page will happen
in a follow-up CL.
Test: Unit, manual
Bug: 238026672
Change-Id: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
(cherry picked from commit 5ecb1a1d69
)
Merged-In: I5fee9ebe03284a013da6bfca9ada8b166c6af91c
2022-09-04 15:44:18 +00:00
Diya Bera
c18579f168
Merge "SecuritySettings test" into tm-qpr-dev am: 73e4742941
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19672131
Change-Id: I9bd7d32f1ada80c9bf6456905a8be6fbe1b1d4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-31 18:56:36 +00:00
Diya Bera
73e4742941
Merge "SecuritySettings test" into tm-qpr-dev
2022-08-31 18:25:45 +00:00
Jenhou (Alan) Huang
6983f5867c
Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev am: 95912773f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459988
Change-Id: I1891fca86dcff9c0251ba56f81f183ac76120162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 05:43:38 +00:00
Jenhou (Alan) Huang
95912773f9
Merge "[VolumePanel] Redirect volume panel action to SystemUI" into tm-qpr-dev
2022-08-30 05:11:39 +00:00
Milton Wu
84c9a6308f
Use setting as base activity for fingerprint am: 561a68db20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732076
Change-Id: I84e533045cb9043e71634400081d02d2f04faf44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-30 00:53:34 +00:00
Alan Huang
a0da5b36bc
[VolumePanel] Redirect volume panel action to SystemUI
...
The volume panel is moved to SystemUIDialog, so we
redirect the volume
panel creation to SystemUI.
Bug: 202262476
Test: manual build and use adb to launch with the volume panel action
intent. $adb shell am start -a android.settings.panel.action.VOLUME
Change-Id: I9f23eb68fb7c83d6f0f023f5eefc4290a35db3c3
2022-08-29 18:50:30 +00:00
Milton Wu
561a68db20
Use setting as base activity for fingerprint
...
Change to use FingerprintSetting as base activity when use launch
"Fingerprint Unlock" from Settings -> Security. And then we can prevent
that necesssary pop-up activites become full-screen.
Bug: 243701933
Bug: 232874879
Test: manual test following cases on fp-only devices, and enable don't
keep activity and test them again.
1. fp enrollment on SUW
2. fp add another on SUW
3. add first fp on Security Settings
4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest
Test: robo test for SetupFingerprintEnrollFindSensorTest
SetupFingerprintEnrollFinishTest
FingerprintEnrollFindSensorTest FingerprintEnrollEnrollingTest
Merged-In: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
Change-Id: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
(cherry picked from commit 84b39c3ed0
)
2022-08-29 07:21:42 +00:00
Tom Hsu
a18ec335a9
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev am: 34cb6d3237
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674012
Change-Id: I30906dc1a60949776b27ba6df3fe723f1eed6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:44 +00:00
Tom Hsu
7dfd2ade2f
Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790
Change-Id: I767bf8a2b177a5b764458e7c8fff90e3de1b869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:42 +00:00
Tom Hsu
34cb6d3237
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Tom Hsu
bd3c0da9e3
Merge "[Languages] Add new information to system language page." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Diya Bera
58facec91e
SecuritySettings test
...
Test: atest
Fixes: 234309000
Change-Id: I3c5772bd33fe7280d35ca0d78a647a5dd7e0a00c
2022-08-24 21:08:04 +00:00
Bonian Chen
80e17e97f3
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev am: 6920c9e7ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673417
Change-Id: I0ce4c4789f2e839ab92b71a8b517cc2680e49c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 07:03:40 +00:00
Bonian Chen
6920c9e7ce
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev
2022-08-24 06:38:58 +00:00
tom hsu
e6b46dc853
[Panlingual] Remove featureflag of app language.
...
Panlingual successfully landed. Hence, we can remove the feature flag
right now.
Bug: b/209775925
Test: atest pass
Test: Manual test pass
Change-Id: I464a206027fd63ee1763acaf17d1b6251e839bc0
2022-08-24 11:29:31 +08:00
tom hsu
3cbb6f8680
[Languages] Add new information to system language page.
...
- Add top Intro preference
- Add footer preference
- Add sub string to language picker
- Modify title of app locale pages
Bug: 242182598 Add information to system language page.
Bug: 241600418 [Panlingual] Change strings on App languages
Test: Maunal test
Change-Id: I9bca8911e8e70c97c273294b3c9d1d73d4ea0cb2
2022-08-24 11:04:24 +08:00
Bonian Chen
9bdca3ba92
[Settings] Data warning & limit UI should be configuable when running out of limit
...
Should access API which is irrelated to status of data limit.
Changing from API isDataEnabledForApn(ApnSetting.TYPE_DEFAULT)
into isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER).
Bug: 223361190
Change-Id: Iada89de38e9db3706a944c7a5b5f8a3e87d415e5
Test: Manual
(cherry picked from commit 7e530dda39
)
2022-08-23 18:37:08 +00:00
Michael Mikhail
d06eaf6f43
Merge "Add media on lock screen setting" into tm-qpr-dev am: c77ab55735
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19457762
Change-Id: I9bfdf646fb6191e201ce014b610cf612c037443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 15:04:04 +00:00
Michael Mikhail
c77ab55735
Merge "Add media on lock screen setting" into tm-qpr-dev
2022-08-22 14:46:06 +00:00
Sayak Dutta
05b7cb0225
Merge "Revamp SD card UX" into tm-qpr-dev am: e66ae3f9db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673917
Change-Id: I589676bfca185db1bbefbe804e9512b72142676d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 06:33:54 +00:00
sayakiitg
efdedcdc15
Revamp SD card UX
...
Improve the SD card setup flow so that each formatting option is provided in a separate screen with clear description and illustration.Also make sure that guest users do not have any access to formatting options.
Test: Manual testing on Pixel Device
Screenshot1: https://screenshot.googleplex.com/WJwyxFkBtbSfZmN.png
Screenshot2: https://screenshot.googleplex.com/3oBcrrgRsKTxNPC.png
Bug: 201252175
Change-Id: I77df55c40fd99cabcfc6128084be035bb5b19531
Change-Id: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
(cherry picked from commit 9b432d54a6
)
Merged-In: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
2022-08-19 19:07:40 +00:00
Joshua Mccloskey
4006c7e9e8
Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev am: b87ada7c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19658607
Change-Id: I70ee59c235d23d1de53ca3eebba4c34e847d332a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 00:55:10 +00:00
Joshua Mccloskey
b87ada7c93
Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev
2022-08-19 00:37:16 +00:00
Joshua McCloskey
739ca9cc97
Added basic SecuritySettingsPref test
...
Test: atest SecuritySettingsTest
Bug: 234309000
Change-Id: I0d54ff17601ed6646c92472f03990a1dd3e4dc4d
2022-08-18 17:36:36 +00:00
Michael Mikhail
56e5b3da96
Add media on lock screen setting
...
Add a new setting that controls whether media on lock screen is enabled,
disregarding the notifications status. The new setting is available
under media and privacy settings.
Bug: 229915240
Test: atest MediaControlsLockScreenPreferenceControllerTest
Change-Id: I054f36efd635dc0535551d3058f9faf92196349d
2022-08-18 11:57:13 +00:00
Robert Luo
c6d8ef82c4
Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491096
Change-Id: Id56424de408fca4a14807e29560a5694c4a63705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:58:02 +00:00
Robert Luo
63aca8e131
Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev
2022-08-17 04:28:08 +00:00
Julia Reynolds
80e1ca7c54
Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197
Change-Id: Iffe89254913fab91b02e3e5db18939912204de40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 19:55:23 +00:00
Julia Reynolds
dbaa419226
Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev
2022-08-16 17:07:18 +00:00
Hugh Chen
2358afae79
RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622
Change-Id: I3dd165a645a1bb63613d541453e32d7c943df776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 04:37:06 +00:00
Julia Reynolds
2a61b3656b
Update Bridged app link when NLS access changes
...
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
2022-08-15 17:50:49 +00:00
Robert Luo
36d320a8de
Allow advanced VPN to manage connection status via its UI
...
Bug: 238641532
Test: atest -c VpnSettingsTest
Change-Id: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
Merged-In: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
2022-08-12 05:47:44 +08:00
Hugh Chen
1311019b9a
RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature
...
- This CL will check whether advanced VPN apk is exist or not,
and if so then show the preference of advanced VPN in the
"Settings > Network & internet > VPN".
Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: I8c11c7f2079d6ebec6c691b8bf2fb26dfc450663
2022-08-11 23:33:30 +08:00
Simon Wingrove
ef498ef53d
Distinguish multiple PendingIntents via requestCode am: 25686219d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19289844
Change-Id: Id8509feac060578cf8d7ffb4d7a7b9def221f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 19:19:15 +00:00
Simon Wingrove
25686219d3
Distinguish multiple PendingIntents via requestCode
...
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.
A unique request code can be used to distinguish between them.
Bug: 238605613
Test: atest LockScreenSafetySourceTest
Merged-In: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
(cherry picked from commit f2b0cedcd0
)
2022-07-18 11:18:28 +00:00
Amy Hsu
a067fba01f
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
am: f51951c9d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: If81fa8f115b89eb458b02736276940d8148458e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:47:15 +00:00
Amy Hsu
ef540c685d
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: I7f6bf6ad05de82ad77ced5bd776c3602f4057290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:31 +00:00
Amy Hsu
f51951c9d3
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev
2022-07-12 03:54:27 +00:00
Hugh Chen
e88be4859c
RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589
Change-Id: Ida6c1387588887b78f33de9f655b5397d04c4258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 00:00:14 +00:00
Robert Luo
bc66c0aba9
Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev
2022-07-11 23:36:02 +00:00
Hugh Chen
95d2add6a2
RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588
Change-Id: I6ba14905e50fb1fad3036cd91a8d2c9ceac2621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 23:09:47 +00:00
TreeHugger Robot
f38e8e6194
Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev
2022-07-11 22:50:58 +00:00