Bill Yi
87f75cd497
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22797863
Change-Id: Icecbf29cc89b9b2766014ff5f45b8d8f99f4e119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:21:12 +00:00
Bill Yi
21e791d44b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22797863
Change-Id: I3ec1f3505fd6f8d9ea8a4d099a98b9abb73e2965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:20:58 +00:00
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
eb6de672dc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-24 21:58:45 +00:00
Bill Yi
ae1b6f1e35
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-04-24 21:58:45 +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
Zoey Chen
10fa1b8aec
[Regional Pref] Remove Calendar controller and related Fragement
...
Bug: 275003276
Bug: 264483854
Change-Id: I2431ea55a7a69db8a4f661a125a6ca218ce41a94
2023-04-24 10:27:10 +00:00
Zoey Chen
4aa05e58bb
[Regional Pref] 1. Add metrics for user changes the First day of week 2.
...
Refactor to Settings design
Bug: 275003276
Bug: 264483854
Change-Id: Ibea987b6e51fd76c89a0ff5269da6e99171f6b1c
2023-04-24 10:26:52 +00:00
Zoey Chen
5d2ce38d3a
[Regional Pref] 1. Add metrics for user changes the Temperature unit 2.
...
Refactor to Settings design
Bug: 275003276
Bug: 264483854
Change-Id: Ib886ace45db8cfd7dd0f468d03a0aa0551f1f5c4
2023-04-24 10:25:44 +00:00
Zoey Chen
af05cf7e0e
[Settings] UI part: Add metrics for numbers preferences
...
Bug: 275003276
Test: local test
Change-Id: I2455252f3ed7f5355a363a79076113bd4452732d
2023-04-24 10:22:03 +00:00
Matías Hernández
8c40305ad6
Tweak refresh of notification channel group preferences
...
Previously, we were discarding and re-adding all channel preference switches when a group was toggled. This caused the group switch itself to flicker and sometimes lose the a11y focus as well. Because the group toggle is always at the top, it's not necessary to ever re-sort it (which is the main reason for doing the remove+add dance).
This CL also resurrects ChannelListPreferenceControllerTest which was disabled.
Fixes: 248056830
Test: atest ChannelListPreferenceControllerTest
Change-Id: I5672c102d4571430e26ad6bee92d8c88794214ae
2023-04-24 11:39:59 +02: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
Zaiyue Xue
1237a70c96
Replace Screen system component time with device screen on time
...
Bug: 278022529
Fix: 278022529
Test: manual
Change-Id: I95a107ea5c3c5e15893c0846c8fd83757e7b9358
2023-04-24 14:10:51 +08:00
Zaiyue Xue
d92c4fc823
Combine screen on time map into battery usage map
...
This cl is refactor only. It makes next cl ag/22809776 easy to replace screen
compenent time with screen on time.
Bug: 278022529
Test: manual
Change-Id: I2538aeafb0c697f13ec617cea44a70a1b2a114b0
2023-04-24 14:08:13 +08: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
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
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
Bill Yi
fb7650e88f
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018
Change-Id: I5e37aa9c2ef4e07e85487b8b88251841e2b850ca
2023-04-22 14:10:27 +00:00
Bill Yi
c4649b3ede
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712
Change-Id: Ieba8c736957dfa9378e5f62bef474ce278596ac3
2023-04-22 14:10:26 +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
51a04e12bf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I627c552f8da0bc57708bffa767acfdb1f4fe9e12
2023-04-21 17:25:02 -07:00
Bill Yi
71c7b5f54c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I747a6dd6b0d5c4b2d23e7334887745ec86c51c11
2023-04-21 17:19:35 -07:00
Bill Yi
ca18853bab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If34cd71ef08b67f4463d83cd1afd5361bae4b873
2023-04-21 17:17:53 -07: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
Bill Yi
fa5e1c57f8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ide3a650caf8d7a7d3a127d31be873d5eb3e067d9
2023-04-21 17:15:06 -07:00
Bill Yi
960fa1521c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I686b72adb7baa39b1bf41d1a4e112530b0d773c6
2023-04-21 17:13:18 -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
SongFerngWang
794fc58235
Replace the SlicePreference with Preference
...
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.
Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)
Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
2023-04-21 23:08:06 +08:00
Ioana Alexandru
e18a7140f3
Add keywords for AOD setting.
...
Used the WiFi slice for inspiration: ag/6793584
Also added "ambient" to the keywords, since "ambient display" is another
phrase used for AOD.
Bug: 279029717
Test: manually checked that the setting shows up when searching for
"aod"
Change-Id: I8a3a4a6635c9724565426b859722242d2bae9e49
2023-04-21 12:54:56 +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