Treehugger Robot
05067bd2e1
Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 5e53a4aa56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862
Change-Id: I1c4c0a0805b9f74fdb57de4f242dc7722dd67d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 16:36:48 +00:00
Treehugger Robot
5e53a4aa56
Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862
Change-Id: Ic63e1482911f219cbf711ce166089bf887b7e40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:44:26 +00:00
Treehugger Robot
59461ffd6f
Merge "[UI][Modifier key remapping] Use new color token." into udc-dev
2023-04-25 15:21:36 +00:00
danielwbhuang
077293b72d
[UI][Modifier key remapping] Use new color token.
...
Chnage materialColorPrimaryContainer to materialColorPrimary
Change materialColorSurfaceContainerHigh to
materialColorSurfaceContainerHighest
Bug: 277712746
Test: manual
Change-Id: I7b23850a24718d28020f6a7b13119c69f50861b1
2023-04-25 09:58:21 +00:00
SongFerngWang
539266a2f3
Replace the SlicePreference with Preference am: 794fc58235 am: c054498357 am: c070721d96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I69ce2df75d1bee0eb1ad048bc253658e9af2ca62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 09:00:40 +00:00
SongFerngWang
c070721d96
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: I43032358808f5e6d5d5cdf3d832418c9cb997a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 08:31: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
Zoey Chen
29efe8eaf7
Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 am: b37a320ed8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358
Change-Id: I8c2c90ccb81c1cc731a899d085b7601c480ef869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:51:21 +00:00
Zoey Chen
b37a320ed8
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: I62c12474a027b6a363dc2d280846507c610bed91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:09:13 +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
3d3dcbab25
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-04-25 01:16:30 +00:00
Treehugger Robot
3f8ee137f2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-04-25 01:16:30 +00:00
Chaohui Wang
5075ba7c38
Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 34a3c229a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357
Change-Id: I04184413dac0fecd1da0a4561adadf10553eed10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 01:10:29 +00:00
Chaohui Wang
34a3c229a0
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: Iac821365230ebabd0ad4648ea43860bf3f8f262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 00:34:15 +00:00
Chaohui Wang
56f2c894d8
Merge "Fix EID dialog related issues" into udc-dev
2023-04-24 23:46:42 +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
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
Zaiyue Xue
96a48380bd
Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e am: cb1e45b5fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757
Change-Id: I2f4b34ee6785a4d44bb9cd315f8cb38b54f82f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-24 07:30:37 +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
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
6e13054555
Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: ab18cb8bcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519
Change-Id: Ie67e1905ca48f5bde13414fad83cb9830af8ef57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-23 06:27:05 +00: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
Bill Yi
5457c4b50b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I833dc4787dcceff5026542ea5ed0dfaa06a80291
2023-04-21 20:01:11 -07:00
Bill Yi
1d92367e32
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7ad9a5450d05a49e86a7ae93cf43ddd0d70c2b4
2023-04-21 19:56:30 -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
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
5c646d4394
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I127281eb9e0cd43de528e58fe5db67ae55fe10b1
2023-04-21 17:16:56 -07: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
Philip Junker
9e34ccd80f
Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: a9e09ac0ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663
Change-Id: I5d184e66b6581e5eeb6620ed0d17fc493384e602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 10:37:38 +00:00
Philip Junker
a9e09ac0ce
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: I7edb0846e9d07ad966fdb3753d02481d4b959cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 10:20:25 +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
TreeHugger Robot
6697ace351
Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291 am: c49f871054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102
Change-Id: I6e29d1464b7e9697dab861a4931219b534b545aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 05:43:48 +00:00
TreeHugger Robot
e7a1f12ea0
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: Iae6ef0f7100dde1b24cffbb2fc447fec14597f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 05:05:11 +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
Treehugger Robot
68c9175e02
Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 am: 533e6d80e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624
Change-Id: I345f4b068ff3cd4f371d6ee9f69b4b26de1abf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:38 +00:00
Treehugger Robot
c2c783ef17
Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec am: d5f6278e49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622
Change-Id: I6d3e0541db7d4c04d5c72f5606a20b7e956ad2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:29 +00:00
ykhung
c80cc83b88
Update battery tip main icon into materiel theme design am: ff65a02ff8 am: a756df402f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582
Change-Id: Ic0cad0444c3d895334e972947b271dbe53687625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:53:19 +00:00
Chaohui Wang
3da7ecc4a4
Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01 am: 95cb923575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782
Change-Id: I63ecd391ab3b962d92792eeaf475572fbaf82e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:52:59 +00:00
TreeHugger Robot
01cea04949
Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe am: 168534ecb4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244
Change-Id: I69669fcd858f08a294739d538ea905fdde92f089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:52:41 +00:00
Julia Tuttle
e5cbf9f05f
Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea am: e81af0ad4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610
Change-Id: Ibe6ccc182416e42ff5ab8c1ebff1639eb742ff0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:19:11 +00:00
Treehugger Robot
72823d814d
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: Ib73a0321690d7b5f62125052b40497a0c4dbadbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:34 +00:00
Treehugger Robot
36ed86a6c5
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: Ifa36325db77fe06b13ec95310b07b2df03d4ce29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:17 +00:00
ykhung
89573cd826
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: I29e3e2aeff9595443fbb83be7ef7a2f95a4aa475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:12:08 +00:00