Bill Yi
4541872412
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22796618
Change-Id: I22af454c706bc4587f28d8975e0a3acc253e7de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:20:39 +00:00
Bill Yi
201aacead9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22796618
Change-Id: I55419a583c64e00be15d1113f6ab7da579c8bf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:20:21 +00:00
Bill Yi
ef269038ef
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-24 21:58:45 +00:00
Randy Pfohl
e2035d8fa1
Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788321
Change-Id: Ib4f09c936b119e230f57910a1ff95fa0357f4efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 18:28:39 +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
241e1e13de
Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev am: d6fb2c45dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789043
Change-Id: Id8731448f34806f2ab5020f15d35e5881f22bff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 16:48:20 +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
Treehugger Robot
0b7282038d
Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev am: 5ae083b952
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802958
Change-Id: If6458359d804f1ca64e61bd580cf72a3bb87e46b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 14:35:14 +00:00
Treehugger Robot
5ae083b952
Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev
2023-04-24 14:07:52 +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
Zaiyue Xue
cb1e45b5fc
Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757
Change-Id: I5c27b7be02cea142cf239463112fbbc3600492b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:12:51 +00:00
Zaiyue Xue
6ebcbdb27e
Merge "Change battery usage screen component name" into udc-dev
2023-04-24 06:59:21 +00:00
Angela Wang
774769f420
Logs Flash Notifications toggle event am: 8b1f85aaac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949
Change-Id: I283d294ec2974d0280a79d087bd1565c452efa1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 06:52:36 +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
Weng Su
179fc5e1f1
Avoid unnecessary re-creating of Wi-Fi password dialog
...
- The Wi-Fi password dialog will be re-created on larger devices, this behavior is unnecessary.
- Modify AndroidManifest to avoid WifiDialogActivity re-creating.
Bug: 259986151
Test: manual test on the device
Change-Id: I394b5ff6d1e0f51c4b2aec270541ce04d6ace9a4
2023-04-24 13:50:09 +08:00
Zaiyue Xue
ca8e34e073
Change battery usage screen component name
...
Bug: 278022529
Test: manual
Change-Id: Ief9c2d83d1eae06047d64578886c0e1572bdcf0d
2023-04-23 15:42:22 +08:00
Chaohui Wang
ab18cb8bcf
Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519
Change-Id: Ia6778caaba3325bcd0c06da3190850182858438c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 05:47:07 +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
Bill Yi
5c646d4394
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I127281eb9e0cd43de528e58fe5db67ae55fe10b1
2023-04-21 17:16:56 -07:00
Jagrut Desai
2146420ddf
Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634
Change-Id: I52091f5f80e53ac7a2545a7fd7bde6a8db5b4976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 16:55:59 +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
92dbbe576e
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663
Change-Id: Iebc8f31e8fac4bddee8687c124c56c3883784b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 10:20:24 +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
cb8fea4125
Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309
Change-Id: I6fe18e9aba304628a45c48eb58e2b234053ff072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 08:13:08 +00:00
Piotr Wilczyński
55110e699e
Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21957485
Change-Id: Ie2d6effc0447df1c0048df01f6be1c90f1d19a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 07:56:50 +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
Treehugger Robot
4f3e5c3a67
Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517
Change-Id: Id83eadb6177a8424a0a28d87633971f7fd58e858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 06:27:59 +00:00
Treehugger Robot
0c1838807d
Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev
2023-04-21 05:57:43 +00:00
TreeHugger Robot
c49f871054
Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102
Change-Id: Ic68000e73a6ea830c39820400ca5da9aec2d3435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 05:04:03 +00:00
TreeHugger Robot
06a4e06291
Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev
2023-04-21 04:28:19 +00:00
Zaiyue Xue
74d8a4b745
Fix BatteryChartPreferenceControllerTest Fail
...
Bug: 279107937
Fix: 279107937
Test: presubmit
Change-Id: Ie5597361e4c3c90737b8dcfc302fc3aad94ea476
2023-04-21 11:12:14 +08: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
Yuxin Hu
518a3ae57a
Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748
Change-Id: Ib87b1532a8256e18529d665378f56c0033e9cc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 21:23:19 +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
e9fb9058cb
Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756
Change-Id: I515ad42531ade8e3171a8f5489a95af9a0d247d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:13:26 +00:00
Ken Lin
da1c577123
Merge "Smooth Display description error" into udc-dev am: 24a5a1c824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748
Change-Id: Ie61fa29667009f338bdcb73d6139c3a7671fadec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:20 +00:00
Elliot Sisteron
031cefc969
Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062
Change-Id: Ied70d69250fb0ec3ae4cd523661f72b7e22670c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:08 +00:00
Treehugger Robot
533e6d80e9
Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624
Change-Id: I731c73fdc88460f1523ff77f507b42ef5322c3ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:56 +00:00
Treehugger Robot
d5f6278e49
Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622
Change-Id: I42bf2bfc4918f9a9388495b87e37137fc9324adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:42 +00:00
ykhung
a756df402f
Update battery tip main icon into materiel theme design am: ff65a02ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582
Change-Id: I994b044a35bf08864cf944698809881a3c0468d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:30 +00:00
Karishma Vakil
f8fe3d4bcc
Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283
Change-Id: I15be0aedfcc4e4555233af0a85cd55c3f85bd0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:20 +00:00
Chaohui Wang
95cb923575
Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782
Change-Id: I9dad3f09aa72baa927e6825f263f86cd35098a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:10:07 +00:00
TreeHugger Robot
87d7e0f59a
Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561
Change-Id: I0e19f735e70359c892d89bbaa35fe4da4ca55e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:55 +00:00
TreeHugger Robot
168534ecb4
Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244
Change-Id: I18094e0de30ce9b605c0c2c0f8a36b28ddef4fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:40 +00:00
Becca Hughes
6dbc9554da
DO NOT MERGE Live update cred man settings am: d8b74b5c39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746581
Change-Id: Iba0353004c19f07c7a4c2fe2df76dbbc5575a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:09:25 +00:00