Chaohui Wang
5075ba7c38
Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 34a3c229a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357
Change-Id: I04184413dac0fecd1da0a4561adadf10553eed10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 01:10:29 +00:00
Chaohui Wang
56f2c894d8
Merge "Fix EID dialog related issues" into udc-dev
2023-04-24 23:46:42 +00:00
Randy Pfohl
e71e582d34
Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d am: e2035d8fa1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788321
Change-Id: I7a585056077f258efd873e424253925bd6991d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 18:50:46 +00:00
Randy Pfohl
a4e868af0d
Merge "Ensure we launch gesture tutorial as new task" into udc-dev
2023-04-24 18:16:08 +00:00
Treehugger Robot
b18bb6d7ab
Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev am: d6fb2c45dc am: 241e1e13de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789043
Change-Id: I85e26047aa5d4a7b9fa784b1e7b674f72593b756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 17:43:45 +00:00
Treehugger Robot
d6fb2c45dc
Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev
2023-04-24 15:54:35 +00:00
Zoey Chen
cec01e38ef
[Regional Preference] Do not get child fragment if the fragment is not
...
added
Bug: 279376395
Test: local test
Change-Id: I352597dedf2ba7770936d44d09aa111762f94502
2023-04-24 12:38:43 +00:00
Angela Wang
dad8ac3b73
Logs Flash Notifications toggle event am: 8b1f85aaac am: 774769f420
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949
Change-Id: Id5c967024269f23c04724b9732f805609dec9b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:30:04 +00:00
Angela Wang
8b1f85aaac
Logs Flash Notifications toggle event
...
Logs the toggle event of different kind of flash notification to better know about how many usage of these feature and make it as our success metrics.
Bug: 277552681
Test: m statsd_testdrive && statsd_testdrive 513, checks the metrics manually
Change-Id: I73068744b7eef391ee459314da21c23cf64ef212
2023-04-24 06:12:23 +00:00
Chaohui Wang
3cdad40840
Fix EID dialog related issues
...
Fix the following issues,
- After eid dialog dismissed, enter other page and back will trigger
eid dialog again
- After screen rotation, dialog content disappeared
Fix: 277871671
Test: Manual
Change-Id: Ibd0ffb182cf69ea40e4b3fe0e8e840931d705df6
2023-04-23 15:49:52 +08:00
Chaohui Wang
6e13054555
Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: ab18cb8bcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519
Change-Id: Ie67e1905ca48f5bde13414fad83cb9830af8ef57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 06:27:05 +00:00
Chaohui Wang
0fa23e9791
Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev
...
* changes:
Fix flicker for Data Usage page
Revert "[DataUsage] Adjusting the control of display sequence"
Revert "[Settings] Adjusting the control of display sequence (part 2)"
2023-04-23 05:14:01 +00:00
Chaohui Wang
8397287f87
Fix flicker for Data Usage page
...
Both "Mobile data usage" & "Non-carrier data usage".
By,
1. Use summary placeholder for usage amount to avoid shift
2. Before fix CycleListener's onItemSelected() is called multiple times,
cause the app list to flash, let DataUsageList to handle the dedup
logic to better handling.
3. Before fix if return from App Usage page, no loading view is
displayed (only first enter has it), move this to onResume() to fix.
4. Before fix the cycles passed to App Usage page is cached (even when
the cycles are changed), clear the cache when onResume() to fix.
5. Listener in SpinnerPreference could be null, add safety guard to it.
Cherry-pick from Change-Id: I95e544c46333496f4f30ed77dafa4779b4d66019
Fix: 277162513
Test: manual visual test
Test: Unit test
Change-Id: I50fb79aa3c888651a79fd1d030da554bebb6a660
2023-04-22 08:47:22 +08:00
Chaohui Wang
f46b33bbc4
Revert "[DataUsage] Adjusting the control of display sequence"
...
This reverts commit b8491032d7 .
Bug: 277162513
Test: Manual
Test: Unit test
Change-Id: I5a84a9b1a99b1da4c18d786a6dff062b53cd46c6
2023-04-22 08:47:21 +08:00
Chaohui Wang
52b723beef
Revert "[Settings] Adjusting the control of display sequence (part 2)"
...
This reverts commit 6b379cd7cf .
Bug: 277162513
Test: Manual
Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
2023-04-22 08:47:20 +08:00
Jagrut Desai
5750a04d1a
Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783 am: 00906998af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634
Change-Id: I94b6f2bdf88678c2a2b69447a3b2a24d03f1fa62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 17:36:48 +00:00
Randy Pfohl
f572cc569e
Ensure we launch gesture tutorial as new task
...
test: built for two pane device and verified it opens full screen
bug: 278918583
Change-Id: Icee33cb4a931e3037eab8e0146eddca55a5fd09d
2023-04-21 16:53:04 +00:00
Jagrut Desai
eea8283783
Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev
2023-04-21 16:16:31 +00:00
Philip Junker
9e34ccd80f
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: a9e09ac0ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663
Change-Id: I5d184e66b6581e5eeb6620ed0d17fc493384e602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 10:37:38 +00:00
Philip Junker
134bea1957
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev
2023-04-21 10:07:47 +00:00
Bill Lin
ffe7901613
Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8 am: 73b4163534
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309
Change-Id: I289891a055dc36b7df2158de3ef0a12666c80a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 08:31:07 +00:00
Bill Lin
a958fc79c8
Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev
2023-04-21 07:35:55 +00:00
Piotr Wilczyński
85d5e3efb8
Merge "Back up the smooth display setting" into udc-dev
2023-04-21 07:31:47 +00:00
lbill
8e12f5257d
Add Null check FingerprintSettings#updateAddPreference()
...
When fingerprint finish enrollment, user click Done
The flow would be:
-> wm_finish_activity
-> relaunch_resume_activity
-> wm_on_destroy_called
-> wm_on_create_called
-> wm_on_start_called
-> wm_on_activity_result_called
In U, we need to add NPE check when updateAddPreference()
earlier then addFingerprintItemPreferences()
-> wm_on_resume_called
Bug: 275519315
Test: manual enroll SFPS, in FingerprintEnrollEnrolling,
rotate device, then complete the enrollment
verify the flow never crash and user can see enrolled
fingerprint in FingerprintSettings
Change-Id: Ia262741aeceeb36eefd159ad2ca1c9fa0e061d54
2023-04-21 02:24:43 +00:00
Daniel Norman
c14d26462b
Adds TEST_MAPPING for Settings > Accessibility unit tests.
...
This initial TEST_MAPPING file is postsubmit only until we validate
which tests are stable enough to be moved to presubmit and which need
fixes.
Bug: 267225211
Test: atest --test-mapping packages/apps/Settings/src/com/android/settings/accessibility
Change-Id: I5e5f337d4ea7618ab92d3daa5171fd8ee1508c59
2023-04-20 22:04:11 +00:00
Jagrut Desai
c36081b833
Adding support for calling into SystemNavigationGestureSettings
...
For taskbar pinning feasture we need to link user to navigation mode system settings,
this CL will create
- New NavigationModeSettingsActivity
- Intent Filter to invoke SystemNavigationGestureSettings
Test: Manual
Bug: 279069606
Flag: not needed
Change-Id: I55b47d158d18bcb075329f795f15b2e6fc2ea810
2023-04-20 13:55:47 -07:00
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
5c42659602
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
Merged-In: Ib2cb2dd100f06f5452083b7606109a486e795a0e
2023-04-20 13:25:38 +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