Bill Yi
f61d20ef0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc
-s ours am: f9392111bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22798066
Change-Id: I8128802db4a5c9f9c92ff01372f0f1adaf0ec309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:40:10 +00:00
Bill Yi
230ca0100e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf
-s ours am: 19a53a5241
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22798066
Change-Id: If22dfa5d81d441eede6d95103cab70f108bd9ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:40:02 +00:00
Bill Yi
d7d5e57707
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35
-s ours am: bcafcba421
-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: Ic96e1fa7acb368e21ec0780bd51bf62f15f8792c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:40:00 +00:00
Bill Yi
df3b739286
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c
-s ours am: f0911b2572
-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: I9b4e71b18a88400153c614c09f2036bf6b63eea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:39:57 +00:00
Bill Yi
06b07322cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef
-s ours am: ec6a532d98
-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: I41e03de20046af7ee9514166beb23be55fcc01ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:39:23 +00:00
Bill Yi
0ae129b16b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394
-s ours am: 7218d10694
-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: I428266076a6cc5613a7bf3a82e8e7b23d318159a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:39:08 +00:00
Bill Yi
f9392111bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22798066
Change-Id: I4d9d0f1a19122f51fcc8cce15cb4c0c0e76fd933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:16:26 +00:00
Bill Yi
19a53a5241
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22798066
Change-Id: I25aaf4e993f96b9247b1efb8bd273a029378d576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:16:18 +00:00
Bill Yi
bcafcba421
[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: Ie4c3ace854f36107dbd35398697545dde1bd3152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:16:15 +00:00
Bill Yi
f0911b2572
[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: I517f2084707e439e43271a2e9f17e0ddc3850b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:16:11 +00:00
Bill Yi
ec6a532d98
[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: I6f3ad8a6d69d07f56c8255e14f2f9c6555e2c1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 22:15:57 +00:00
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
dd8fdf3949
Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d
am: a8e19402ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788321
Change-Id: Id39423f0dbcff0b1874d263100fa1a93d17fbc11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 18:50:04 +00:00
Randy Pfohl
948f3f0a25
Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d
am: 23015041a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788321
Change-Id: I059af02dc869111b019f1f58577859a083534e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 18:46:52 +00:00
Randy Pfohl
23015041a4
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: I41ca0ae8964074306cff9e537842980dbb2ea00b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 18:28:47 +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
Treehugger Robot
d6c6be2ca9
Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev am: d6fb2c45dc
am: 9a35d47d68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789043
Change-Id: I6cbe372a92b8465ddf7dc8d326c79dbd838a3fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 18:04:50 +00:00
Treehugger Robot
756ccb4ffd
Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev am: d6fb2c45dc
am: 76a0dae43b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789043
Change-Id: Ifc5df7fd80e6cc65a5f72a4a77b8c9d97ef62ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 17:28:02 +00:00
Treehugger Robot
9a35d47d68
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: I8c187cfc4301af169454bcc4fe15877134c6035c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 17:21:58 +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
95e4d85164
Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev am: 5ae083b952
am: bd928079ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802958
Change-Id: I373fe708efbd6a4ad86389e896d3df75a71036fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 15:21:00 +00:00
Treehugger Robot
ad40884cbb
Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev am: 5ae083b952
am: 5019020268
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802958
Change-Id: I9060aa1b56c7907214c64c685aec630164910c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 15:19:57 +00:00
Treehugger Robot
5019020268
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: I9f9b26ab62dc1f4b72bc52d712ce3335000ca0fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 14:40:19 +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
Zaiyue Xue
82b1963cde
Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e
am: 14d7a77554
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757
Change-Id: Ibedc5584d83fbef63a8836de9e637c928b510319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:34:49 +00:00
Angela Wang
748edb6be6
Logs Flash Notifications toggle event am: 8b1f85aaac
am: 693611fa18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949
Change-Id: Iddcec612dccd548899836fd015bf86bbb3e8a4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:34:39 +00:00
Zaiyue Xue
69f5e991ab
Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e
am: 3e22025c95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757
Change-Id: I5db4d3105c29c0870523670ce6232933cf55fa40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:31:24 +00:00
Angela Wang
8651b766d7
Logs Flash Notifications toggle event am: 8b1f85aaac
am: 64466c5c3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949
Change-Id: I427c55f2d1d8ad17e318749754e5e3f6abb24386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:30:04 +00: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
3e22025c95
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: I363378cfdfa7a353f5b3c71dee9933a81d468b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:12:55 +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
64466c5c3d
Logs Flash Notifications toggle event am: 8b1f85aaac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949
Change-Id: Ifc9bd5e497ec1ee386bad8eac725a299e90c7b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 06:52:42 +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
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
88b5e80d37
Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791
am: deeb5916f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519
Change-Id: Icb98a7258b718325ad9437e5cf0cb073e45029cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 06:30:29 +00:00
Chaohui Wang
ae541c2ebb
Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791
am: 80112c15cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519
Change-Id: I091becfc044a1ec8cf5e3cf153a3935688ad052d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 06:25:33 +00:00
Chaohui Wang
80112c15cb
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: I3c6edaaeb38ccb7a1a7f13e78450e18625fd77a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 05:47:08 +00: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
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