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
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
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
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
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
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
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
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
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
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
6d4b01e8c9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52fd610af8f3b68cdaf5e4c7540d37c1891da780
2023-04-21 19:58:33 -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
Presubmit Automerger Backend
56c8b39d51
[automerge] Replace the SlicePreference with Preference 2p: 794fc58235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Bug: 270544054
Change-Id: I88bb34649b2a1da21e6a3a36d90bd32c17ffb5ae
2023-04-21 15:08:44 +00: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
Ioana Alexandru
e18a7140f3
Add keywords for AOD setting.
...
Used the WiFi slice for inspiration: ag/6793584
Also added "ambient" to the keywords, since "ambient display" is another
phrase used for AOD.
Bug: 279029717
Test: manually checked that the setting shows up when searching for
"aod"
Change-Id: I8a3a4a6635c9724565426b859722242d2bae9e49
2023-04-21 12:54:56 +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
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
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
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
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
Chaohui Wang
7d063294d8
Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782
Change-Id: Ib03b3040068455718a580b59d288390e0ef4d37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:52 +00:00
TreeHugger Robot
0b2f7c967a
Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244
Change-Id: I27756cc3637a0e3a841e9a07303685e774b3f350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 20:11:33 +00:00
Julia Tuttle
e81af0ad4e
Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610
Change-Id: Ib434b5e4190dd486f7bf55378bc14950c6132dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 19:57:38 +00:00
Treehugger Robot
8609ef2291
Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev
2023-04-20 11:29:47 +00:00
Zoey Chen
4d0d06fcfe
[Settings] Dialog does not show full msg and title in landscape mode
...
Add scroll bar and fix the text's style
Bug: 278831022
Test: manual local test
Change-Id: Ic0ad0c097099181f92535dba247d0c646904b7c7
2023-04-20 11:04:06 +00:00
Treehugger Robot
bc67d885ec
Merge "Update the proper App battery usage string on App info page" into udc-dev
2023-04-20 10:50:46 +00:00
Zaiyue Xue
0aee0e6aa0
Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."
...
mock: https://screenshot.googleplex.com/C8ZbSL6UfJ9jRJx.png
screenshot: https://screenshot.googleplex.com/4nqRv3UA2iGoQuK.png
Bug: 278986376
Fix: 278986376
Test: manual
Change-Id: Iccb67c3695b21b62d5d26a96a791ca46a1ba7e0a
2023-04-20 17:49:49 +08:00