Tetiana Meronyk
401b7163f8
Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439 am: e9fb9058cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756
Change-Id: If21d1e0f59eeed20ff322c47052b793a4fe07774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:54:08 +00:00
Ken Lin
cd1ef6ece1
Merge "Smooth Display description error" into udc-dev am: 24a5a1c824 am: da1c577123
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748
Change-Id: I60077dbfcd07cef1cad1e54ed03573119db21eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:57 +00:00
Elliot Sisteron
e5c08f5ed4
Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8 am: 031cefc969
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062
Change-Id: Idb49021702af5a1a71409f6d9ef5a16ed69b381a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:48 +00:00
Treehugger Robot
68c9175e02
Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 am: 533e6d80e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624
Change-Id: I345f4b068ff3cd4f371d6ee9f69b4b26de1abf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:38 +00:00
Treehugger Robot
c2c783ef17
Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec am: d5f6278e49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622
Change-Id: I6d3e0541db7d4c04d5c72f5606a20b7e956ad2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:29 +00:00
ykhung
c80cc83b88
Update battery tip main icon into materiel theme design am: ff65a02ff8 am: a756df402f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582
Change-Id: Ic0cad0444c3d895334e972947b271dbe53687625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:19 +00:00
Karishma Vakil
4e9381bdd7
Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132 am: f8fe3d4bcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283
Change-Id: I68458725ebdbaf8ee6f88b4b27d3c070854008f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:08 +00:00
TreeHugger Robot
a4ca093e8a
Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b am: 87d7e0f59a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561
Change-Id: I9c905176f89cd58b9987a857642a149a2a0fd14e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:52:50 +00:00
TreeHugger Robot
01cea04949
Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe am: 168534ecb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244
Change-Id: I69669fcd858f08a294739d538ea905fdde92f089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:52:41 +00:00
Diya Bera
722e1d745f
Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 am: 8a31106496 am: 6fbfec99c8 am: 7d251f4c51
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ibe5961df45de03204f7e3b8e5c6968e58c1ebf41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 17:14:17 +00:00
Tetiana Meronyk
84da171439
Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev
2023-04-20 15:12:57 +00:00
Piotr Wilczyński
bb755ef527
Merge "Back up the smooth display setting" into udc-d1-dev am: 2160faafb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724662
Change-Id: I55c28341ec31ccd1a9265a9903048464d27eb859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 14:01:37 +00:00
Ken Lin
24a5a1c824
Merge "Smooth Display description error" into udc-dev
2023-04-20 14:00:53 +00:00
Piotr Wilczyński
2160faafb4
Merge "Back up the smooth display setting" into udc-d1-dev
2023-04-20 13:25:07 +00:00
Elliot Sisteron
0a506448b8
Merge "Launch work profile entries intent in the profile parent." into udc-dev
2023-04-20 12:19:33 +00:00
Treehugger Robot
8609ef2291
Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev
2023-04-20 11:29:47 +00:00
Treehugger Robot
bc67d885ec
Merge "Update the proper App battery usage string on App info page" into udc-dev
2023-04-20 10:50:46 +00:00
Zaiyue Xue
0aee0e6aa0
Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."
...
mock: https://screenshot.googleplex.com/C8ZbSL6UfJ9jRJx.png
screenshot: https://screenshot.googleplex.com/4nqRv3UA2iGoQuK.png
Bug: 278986376
Fix: 278986376
Test: manual
Change-Id: Iccb67c3695b21b62d5d26a96a791ca46a1ba7e0a
2023-04-20 17:49:49 +08:00
ykhung
ff65a02ff8
Update battery tip main icon into materiel theme design
...
Update all battery tip icon into materiel theme design based on the UX
feedback and clean up legacy icons
Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I82f5b140700a36b29844c0c3330b2eeeda8e5a55
2023-04-20 09:19:36 +00:00
Karishma Vakil
85e5174132
Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev
2023-04-20 04:04:19 +00:00
TreeHugger Robot
d21225790b
Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev
2023-04-20 03:34:29 +00:00
TreeHugger Robot
fb52240afe
Merge "Fix RTL display problem in Open by default" into udc-dev
2023-04-20 01:59:00 +00:00
Karishma Vakil
151d3deed2
[Safety Labels] Enable safety label change notifications flag by default
...
in Settings code
Bug: 261249312
Test: atest CtsPermission3TestCases
Test: atest AppDataSharingUpdatesPreferenceControllerTest
Change-Id: I34da5e4d140731b00749c89f8b328a2f2cb93e61
2023-04-19 23:50:57 +00:00
Becca Hughes
d8b74b5c39
DO NOT MERGE Live update cred man settings
...
This CL will enable live update of credential
providers if any are added/removed.
Test: atest
Bug: 264420106
Change-Id: I14804bac17a4efe5eccd3c5824558eace18da186
2023-04-19 22:06:15 +00:00
Diya Bera
6fbfec99c8
Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 am: 8a31106496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ie1505f0272340b867648341bfe01f26e948f14b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:54:50 +00:00
Diya Bera
8a31106496
Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170
Change-Id: Ibfc5a6684f98c842f95f5cb125310d89a0035644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 17:39:42 +00:00
Becca Hughes
7039cdb12a
Live update cred man settings
...
This CL will enable live update of credential
providers if any are added/removed.
Test: atest
Bug: 264420106
Change-Id: I14804bac17a4efe5eccd3c5824558eace18da186
2023-04-19 16:19:28 +00:00
Pavel Grafov
542b0fd031
Merge "Fix uninstall button can't click problem" into udc-dev am: b8d639c8fe am: ccda5d60ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22645501
Change-Id: I9859fa1d5dc8ee2880a4a4363c1819dfe48ec4bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 14:28:49 +00:00
Pavel Grafov
b8d639c8fe
Merge "Fix uninstall button can't click problem" into udc-dev
2023-04-19 12:50:27 +00:00
Piotr Wilczyński
af320436fb
Back up the smooth display setting
...
- Convert "Smooth display" and "Force peak refresh rate" to a boolean. If they are a boolean, they can be backed up without being device-specific.
- Back up "Smooth display" and add a validator
- Upgrade the settings in SettingsProvider
- Create a utils class - RefreshRateSettingsUtils
Bug: 211737588
Test: atest DisplayModeDirectorTest
Test: atest ForcePeakRefreshRatePreferenceControllerTest
Test: atest PeakRefreshRatePreferenceControllerTest
Test: atest SettingsBackupTest
Test: atest SettingsProviderTest
Change-Id: Ib2cb2dd100f06f5452083b7606109a486e795a0e
2023-04-19 11:35:08 +00:00
Milton Wu
3024352f85
[BiometricsV2] Fix fingerprint add another fail
...
Fix enrolling can't finished because FingerprintEnrollment attaches to
wrong ViewModel during onCreate() with non-null savedInstance after
rotation.
Read latest fragment through findFragmentById to fix it
Bug: 275513362
Test: atest FingerprintEnrollmentActivityTest
Change-Id: Icb2c0edec325a813ec5a7822aba39ca201d2d8e9
2023-04-19 17:35:33 +08:00
YK Hung
f90193c381
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev am: 3f9363aaff am: ed340caca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22695011
Change-Id: I100c1d49ec14d2d7e43b273a01546a67bd994801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 09:05:07 +00:00
Yanting Yang
3be454f967
Update the proper App battery usage string on App info page
...
Bug: 278045681
Test: visual
Change-Id: I4da671615f11554e2cd64f3a801252df5c0ba6f4
2023-04-19 17:00:46 +08:00
YK Hung
3f9363aaff
Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev
2023-04-19 07:40:45 +00:00
Zoey Chen
98082c8ad2
Merge "[Settings] Remove the large space when searching language" into udc-dev am: 5614c1e7dc am: 446909b4da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22713802
Change-Id: I55ee03379a7526c15c971ed75fba6d6c5ffb2358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-19 06:47:28 +00:00
ykhung
ab07b53ea1
Fix banner tip buttons visibility and update incompatible tip
...
Fix the battery settings banner tip buttons visibility not reset issue
and update the incompatible charging tip into the colored primary button
Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.widget.CardPreferenceTest
Change-Id: I9b72fccc7838d974d3b60d0f9684780841623cbb
2023-04-19 06:24:51 +00:00
Zoey Chen
5614c1e7dc
Merge "[Settings] Remove the large space when searching language" into udc-dev
2023-04-19 05:19:56 +00:00
ot904699
f1f4097f20
Fix uninstall button can't click problem
...
Install CtsVerifier.apk and CtsEmptyDeviceAdmin.apk. When CtsEmptyDeviceAdmin is active device administrator, “Uninstall” button can’t click, we can’t uninstall the apk.
Compared with Android T, the ability to uninstall Active admin's apk is disabled by default on Android U. Make this cts test pass after modifying the setup code
Bug: 277545241
Test: manually
1. Enter the CtsVerifier apk
2. Click “Device Admin Uninstall Test”
3. Click “ENABLE ADMIN”, then click “Activate this device admin app”
4. Click “LAUNCH SETTINGS”
(cherry picked from https://partner-android-review.googlesource.com/q/commit:67ecb5aef52d18332402d88a418aa4b87d047b87 )
Merged-In: I200cfe56a3529e9c6ee5eebf4b2606237608a4b2
Change-Id: I200cfe56a3529e9c6ee5eebf4b2606237608a4b2
2023-04-19 03:21:53 +00:00
Sunny Shao
b0b8ca7e1c
Fix RTL display problem in Open by default
...
- setTextDirection for ListView ih the verified links dialog.
- setCompoundDrawables for TextView in the supported link dialog.
Fixes: 277082703
Fixes: 277084378
Test: manual review
Change-Id: Ib42ed2f04785a5f1803b9d2d95055e4208c9e88f
2023-04-19 09:07:50 +08:00
Becca Hughes
3ac6b141a4
Merge "Rollback decision to merge by package name"
2023-04-19 00:08:57 +00:00
Diya Bera
33fab7e415
Adding owners
...
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
2023-04-18 22:56:31 +00:00
Becca Hughes
ca542c90cd
Rollback decision to merge by package name
...
At the moment settings aggregates by
package name and it has been decided that
we should do per-service instead.
Test: atest & manual
Bug: 278598419
Change-Id: I6b7c8adac4957f1c3382044208e1642d0b6e3fab
2023-04-18 22:15:50 +00:00
Linyu He
32acd8c90d
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev am: e346dc6779 am: 3abe7779e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22715841
Change-Id: I04a4b7e9a80ba6effc9f90b32be5c70303671c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 20:02:30 +00:00
Treehugger Robot
62ca723b6d
Merge "Revert "Destroy activity in onStop()"" into udc-dev am: 6112e583d7 am: 616fd2b0e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22691451
Change-Id: I3bdbc364829ba0f93454edb2c2a59c3128e2b2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 19:59:30 +00:00
Linyu He
e346dc6779
Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev
2023-04-18 19:36:45 +00:00
Treehugger Robot
6112e583d7
Merge "Revert "Destroy activity in onStop()"" into udc-dev
2023-04-18 19:07:33 +00:00
Liana Kazanova
94f08e4ba1
Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."
...
Revert submission 22338257-turnScreenOnPermission_pregrant
Reason for revert: b/278739832
Reverted changes: /q/submissionid:22338257-turnScreenOnPermission_pregrant
Change-Id: Iada276497c37c0e89a2cde8706394949d468e8e5
2023-04-18 17:47:14 +00:00
Elliot Sisteron
6356de3f9b
Launch work profile entries intent in the profile parent.
...
The screens don't work as expected if they're launched in the work
profile. The reason for this is that Settings handle the user separately
with an extra inside the intent. I assume launching the actual screen in
a separate user is not supported.
Note that I've also:
1. Added a safeguard to make sure that the "active unlock" code path
only occurs in the profile parent — it seems preferrable (see
b/277877289#comment4)
2. Added the user id as an identifier on the intents lauched by the
entries. The reason we do this is to make sure the user id is taken
into account in the PendingIntent#equals implementation. This was
automatically taken care of when launching with the profile context,
but now that we launch everything in the profile parent context we
have to make sure the user id is taken into account
Bug: 278665241
Bug: 277877289
Test: manual
Change-Id: Idcaa31cd56ed64768aa8f069d30d2adeb7269099
2023-04-18 17:24:39 +00:00
Zoey Chen
7026760615
[Settings] Remove the large space when searching language
...
Don't expand the tool bar when users search the language because they will see a large space on the top.
Bug: 254387685
Test: local test
Change-Id: I52fbf4be47885ea6c7d2b6abb75db99c1690edca
2023-04-18 17:20:42 +00:00
Treehugger Robot
2f6ea6addb
Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev am: dc02736824 am: b24b622c3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22651125
Change-Id: Ia14eb54b4b0826dee20b761be9a22078849bdeed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-18 17:18:35 +00:00