Commit Graph

123225 Commits

Author SHA1 Message Date
SongFerngWang
04f9745471 Replace the SlicePreference with Preference am: 794fc58235 am: c054498357
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: Iba37ecd28590de9ca276c4cce3cec73324650e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:11:05 +00:00
SongFerngWang
c054498357 Replace the SlicePreference with Preference am: 794fc58235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I5e9032624347b27acb02eafd28002744d92b5f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 06:23:25 +00:00
Treehugger Robot
9b25f5ac88 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519

Change-Id: Ia19da83e61ec2bfbfbbb61110c605c401dd0295e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 04:12:11 +00:00
Treehugger Robot
ea3a970826 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev 2023-04-25 03:59:03 +00:00
Zaiyue Xue
796c2ef5ca Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776

Change-Id: I6a72fe235b10dccd92cc56be7cf4e5f5e7a170f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 03:49:44 +00:00
Zaiyue Xue
8892fd48ca Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: Ic49b7f1c2382914ac42bd213629150f7dfc35dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 03:49:13 +00:00
Zaiyue Xue
f3a3634aa5 Merge "Replace Screen system component time with device screen on time" into udc-dev 2023-04-25 03:32:02 +00:00
Zaiyue Xue
cfa374f997 Merge "Combine screen on time map into battery usage map" into udc-dev 2023-04-25 03:31:39 +00:00
Zoey Chen
c28a5c3431 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: I08689116c085fd322166bf2ef817a961b42a4cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 03:28:02 +00:00
Zoey Chen
609b91c715 Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: I82ededa655a73151d1b5a837426bd02c11cbdcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 03:27:38 +00:00
Zoey Chen
c31cf3d3b4 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev 2023-04-25 03:00:20 +00:00
Zoey Chen
1d74998647 Merge changes from topic "regional_preference_metrics" into udc-dev
* changes:
  [Regional Pref] Remove Calendar controller and related Fragement
  [Regional Pref] 1. Add metrics for user changes the First day of week 2. Refactor to Settings design
  [Regional Pref] 1. Add metrics for user changes the Temperature unit 2. Refactor to Settings design
2023-04-25 02:59:27 +00:00
Treehugger Robot
ed9f22b78a Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I968e42bdcd64a2325105458eedf106e389bde932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:21:06 +00:00
Bill Yi
0a2936d879 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I46369b2d98f829b295f9164f8a7069a7ce71a799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 02:20:45 +00:00
Treehugger Robot
ef196f7f3e Merge changes from topic "tc_change_23042206_47" into udc-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
  Import translations. DO NOT MERGE ANYWHERE
2023-04-25 01:26:27 +00:00
Treehugger Robot
646e95241d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
103dfefdad Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
29ba678514 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Chaohui Wang
7823686740 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Iefc5bc85dc359433dcb6957cfee81eda843ee6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:24 +00:00
Chaohui Wang
56f2c894d8 Merge "Fix EID dialog related issues" into udc-dev 2023-04-24 23:46:42 +00:00
Bill Yi
ae326b5f83 [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: Ib5a8ee9b80ccb8f0c273639bb89ea0292bdcca12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:15 +00:00
Bill Yi
fc348ab76d [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: I033f9c93563a42de2f66b95755d3a2065afde756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:06 +00:00
Bill Yi
733d6f5579 [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: Ia1f0dca00066d1b4f70e6ab25376e062febe7b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:04 +00:00
Bill Yi
f477d02f91 [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: If64d573e1afe581c8c74e53132b457e139e5b7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:49 +00:00
Bill Yi
e676a561d8 [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: Ieff87595cbaef00ddd362c382f184b7cbbb12b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:32 +00:00
Bill Yi
f537b87b7a [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: Ic0761413dfee3b88b40f563eb0a9e5182bc2a7ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:13 +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
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
a4e868af0d Merge "Ensure we launch gesture tutorial as new task" into udc-dev 2023-04-24 18:16:08 +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
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
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
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
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
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