Commit Graph

29495 Commits

Author SHA1 Message Date
Becca Hughes
2727a730ee Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: I0eefbcc9008570a6d47436ccd49e2be23b160a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:35:42 +00:00
Becca Hughes
63f71a54e4 Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: Ic56c750748920a3c568199c20a2717b453af359f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 23:30:50 +00:00
Becca Hughes
ccd03c9e70 Merge "Update string based on new mocks" into udc-dev 2023-04-25 22:51:39 +00:00
Brian Lee
2bb2b5f534 Set minHeight for remote lockscreen validation checkbox
Bug: 279138756
Test: Accessibility Scanner
Change-Id: I83df33b3d922bce857d8c9a21bfda06cc8ef5659
2023-04-25 14:39:27 -07:00
Treehugger Robot
92d559063f Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f am: 525000b2ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: Iecf2fefbeae49b3fa44d417d2eaac74c104d26cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 16:36:58 +00:00
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
f91d762067 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: I903d55885c376719d05b09cf00d7954f4e55434d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 15:44:23 +00:00
Treehugger Robot
525000b2ab 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: I5446a849786124fec429c50c1cc7b6b373400a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 15:43:59 +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
Marcello Galhardo
0061d4093a Create the Note Task shortcut using the SystemUI Context
By using the SystemUI Context to create the shortcut, we allow SystemUI to manipulate the shortcut and apply updates such as enabling or disabling the shortcut, or even updating the app badge override package.

Test: manual

Fixes: b/278724068
Change-Id: I926a775923528aacfaf9b62141234b770f381c79
2023-04-25 09:49:40 +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
SongFerng Wang
4b8ac3daa9 Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae am: f929dc6dea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: Iab16c528e722e71eac6cbc223a68a567e95cfd80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 07:41:59 +00:00
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
SongFerng Wang
f929dc6dea Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I25f24e707f42147d28101ed00da233b37218865e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 06:47:35 +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
ca01227cbb Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 am: 609b91c715
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: Ic6853f25c0ac65a0a31114dcd65c0047f0ff0550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 04:33:22 +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
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
221a58918c 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: I10c1d03beb08f2425de8552a7a8d6697ed3b873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 03:23:46 +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
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
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
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
5fba57460c 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: I89ef02b853287ce35d1feb7bd0c6abeccdfdbc61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:24:45 +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
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
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
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
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
1c43541f1c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7379e50c5abc890323f0ee25431f2a3c363f71a0
2023-04-21 20:03:55 -07: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
6d4b01e8c9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I52fd610af8f3b68cdaf5e4c7540d37c1891da780
2023-04-21 19:58:33 -07:00