Bill Yi
7218d10694
[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: Ie3a73e2fef1e079f3dca4794a41f45f46e1be4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:15:22 +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
a8e19402ab
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: Icdc5a9074af0a09d5b0a5a366761e1eb37d27a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 18:28:31 +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
Fangqiu Su
828f2fcec9
Update uiautomator references in packages/apps/Settings/tests/unit
...
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
"androidx.test.uiautomator_uiautomator" (v2.3.0).
Bug: 235842600
Test: mmma .
Change-Id: I55c2d77b0bcd3b673de5a0b42170414de5fc3baf
2023-04-24 18:07:07 +00:00
Fangqiu Su
643e908ec4
Update uiautomator references in packages/apps/Settings/tests/uitests
...
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
"androidx.test.uiautomator_uiautomator" (v2.3.0).
Bug: 235842600
Test: mmma .
Change-Id: I216758dc3898875c41f865f5aa25d20bf0386aed
2023-04-24 18:03:02 +00:00
Fangqiu Su
61c93dc8c3
Update uiautomator references in packages/apps/Settings/tests/perftests
...
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
"androidx.test.uiautomator_uiautomator" (v2.3.0).
Bug: 235842600
Test: mmma .
Change-Id: I19484ff3b0c7f9db24534b175c2d321ac5a30909
2023-04-24 17:49:02 +00:00
Treehugger Robot
76a0dae43b
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: Iff5950f22dd26f07a5a2d8c89796dbe062ececc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 16:53:31 +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
bd928079ff
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: Id6ffcfc44c0a7507b6a24f0dc7c2e2a57f5ea52b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 14:31:03 +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
14d7a77554
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: I9fdd7b5c9cc07d905ffe76ab3774b31d4fb309d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:29:57 +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
693611fa18
Logs Flash Notifications toggle event am: 8b1f85aaac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949
Change-Id: I6c7420d98ab8ad0e440151297f8f28704ca4fb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 06:48:25 +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
deeb5916f9
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: Id3722ad9a28e07c967c8d7e49f5145ba346db567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 05:42:59 +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
6c113d0c54
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
2p: aaa28fb0e7
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I032630e40afe781886eb18b9714a38bb65f7ffda
2023-04-22 14:20:18 +00:00
Bill Yi
aaa28fb0e7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I7923220a59923528c5ca01061d950381fb79a823
2023-04-22 14:16:37 +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
Bill Yi
efc9e1994c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iebd01ca77113b13be8c469a3105249fe6b241843
2023-04-21 23:46:19 -07:00
Bill Yi
c416adc1df
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I50740b630f3d8ad4d10d3ba3774007bef0282672
2023-04-21 23:43:10 -07:00
Bill Yi
a05355cc0a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9526dff7032a7247775459386d64669e27068665
2023-04-21 23:39:13 -07: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
Xin Li
eb2cb56f9b
[automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c
-s ours am: 57c5a99b9f
-s ours
...
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22726134
Change-Id: I4127df037d90c6b9ac4c9a63a7cc02ff967abf3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 22:36:27 +00:00
Xin Li
ce8657848c
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca
-s ours am: b27298c4fe
-s ours
...
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22726134
Change-Id: I28a18e0f9c9d0f394026476f10b620286a877786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 22:34:06 +00:00
Xin Li
57c5a99b9f
[automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c
-s ours
...
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22726134
Change-Id: Ica592b8926aca252eb1384319bd886b633ac185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 18:18:31 +00:00
Xin Li
b27298c4fe
[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca
-s ours
...
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22726134
Change-Id: I384b965aecd6723b49042933cd1116365da09f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 18:15:13 +00:00