Bill Yi
6f0a72f5e5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35
-s ours am: 733d6f5579
-s ours am: a90458fe71
-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: I4a5c082f9b4c54ad9a1e8f08619ff798dbf48237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:40:19 +00:00
Bill Yi
46595042f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c
-s ours am: f477d02f91
-s ours am: eb791b09dd
-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: I59d60a43e63eff62d313bc42063da4668a05bcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:40:16 +00:00
Bill Yi
47321ef8a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef
-s ours am: e676a561d8
-s ours am: fe774bfa67
-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: I1e2f5203906dfeed8d9ef58ede6d58a06ded236c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:40:09 +00:00
Bill Yi
291585cfa9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394
-s ours am: f537b87b7a
-s ours am: 41fa42fc6a
-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: I2c0ed6c267f34591093c8f7457b61a3914d74a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:39:27 +00:00
Treehugger Robot
0e084ba633
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 6a0935a34f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I603bf91d4995829fae5ef18c512f0672eaa1f240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:29:00 +00:00
Treehugger Robot
ee690ca0eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 6a0935a34f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I3992f2d338e853b677aa14b2ecb26b73212d4b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:28:35 +00:00
Bill Yi
a3dc766061
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab
-s ours am: ffe604c85c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I49b02e2e25891f61a4ec93986e33a5097eb3250f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:28:12 +00:00
Bill Yi
b9e6bd201f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab
-s ours am: ffe604c85c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: Ib0fd25bf66e535f59b20ba717ba5e28ea39b0416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:28:08 +00:00
Treehugger Robot
114f7ae8a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 6a0935a34f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: Ic7447951a151b87e2535c3ecdfd25b82984ee588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:27:04 +00:00
Bill Yi
b0cb91a1bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab
-s ours am: ffe604c85c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I5b8e9fff5b23f359c30611ad308d2fad4bafd167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:26:24 +00:00
Treehugger Robot
f7660ac12b
Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp am: 2fbc693eaa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: If640cff9ecc2bce74586cef4c7d0b73650f67575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:14:42 +00:00
Bill Yi
47cb4197f1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
2p: aaa28fb0e7
am: 6c113d0c54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I34f9ddd4619d74d0638bd35cd22f75721b150cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:14:17 +00:00
Treehugger Robot
6a0935a34f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I11af2e25300a6dc5f106b694ffb2fc5a558c52c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:06:44 +00:00
Bill Yi
ffe604c85c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: Ice851b6bd9aed5f50ea95b4ab778793eff02b3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:05:38 +00:00
Treehugger Robot
f928142955
Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f
am: f91d762067
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862
Change-Id: Ib1b678d0fb296fd6f48e40b58c40ee5dd0a4ebab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 17:05:14 +00:00
YK Hung
1b9cdf1ac1
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
am: 245759ba42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117
Change-Id: I7508a576d2044aefb6fd4a76ab0ad233d09bed64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 16:56:55 +00: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
YK Hung
79042d3db5
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
am: 8c1bae8a06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117
Change-Id: Ifdc004e42066c2f67e7530e4aa73e6f491ba8446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 16:35:42 +00:00
YK Hung
c2474363a7
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
am: 4fb520d99a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117
Change-Id: Ie87d989de63a331c6a5e278a983cffae9ad23594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 16:35:05 +00:00
Lin Yuan
f57e52a64d
Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
...
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.
screenshot: http://shortn/_kkK3BMTSh1
Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
2023-04-25 12:30:03 -04:00
Treehugger Robot
2fbc693eaa
Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
2p: aaa28fb0e7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab
Import translations. DO NOT MERGE ANYWHERE
2023-04-25 16:17:15 +00:00
Treehugger Robot
33837c6766
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-04-25 16:17:03 +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
YK Hung
8c1bae8a06
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117
Change-Id: Ic85524a805665044aa826656a88bc52e9a5e79b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:43:12 +00:00
YK Hung
4fb520d99a
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117
Change-Id: I40ad3c374585d14685c8ec564ce0738fd95344ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:43:01 +00:00
YK Hung
245759ba42
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117
Change-Id: I08cedbf20a7693a92ab0163277e4d31c62cf44e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:43:00 +00:00
Fangqiu Su
ef47b4b811
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
am: 29f3d022f7
am: 924208bb0f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: I4bdbd1c3804da01c002b139990e9c9a6745a067f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:37:41 +00:00
Matías Hernández
92799de2d7
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
am: cb13bd964d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: Ie4fdbf539499f9426a838d007ec927257bea47a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:24:49 +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
Matías Hernández
f661eb5fdc
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
am: 8a98f248c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I812600318e52629c0d9a10ecab6b7c006155a83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:20:52 +00:00
Matías Hernández
78b7892f2f
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
am: b168628c13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I020f10a1b238245175e299a23bd3c48cdd89a241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 15:18:40 +00:00
YK Hung
6853b5d733
Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev
2023-04-25 15:01:51 +00:00
Fangqiu Su
924208bb0f
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
am: 29f3d022f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: If98e04dea79ae03a0f1cfe3969df530583c66289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:44:36 +00:00
Matías Hernández
b168628c13
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I1f89f6afcb175adfa0f79de6084481c3404caa58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:42:21 +00:00
Matías Hernández
8a98f248c1
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I81999f1723a8b3fee260334c39fddd5a1689f34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:41:11 +00:00
Matías Hernández
cb13bd964d
Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580
Change-Id: I889dff9b16777539e8e8d9775c7ae3fe0bf462e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:37:35 +00:00
Matías Hernández
c49cb1014c
Merge "Tweak refresh of notification channel group preferences" into udc-dev
2023-04-25 14:00:14 +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
Wesley Wang
a4bafafb21
Fix Settings app crash cause by BadParcelableException
...
Bug: 279391146
Test: make SettingsLibRoboTests
Change-Id: I32dd0aa87c405786fe28b15721e4edbcb4d73a98
2023-04-25 17:49:12 +08: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
Fangqiu Su
c606c6f0b2
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
am: 378e7af38e
am: 5ce99863ea
am: 064c80b470
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: Ie42dc39215851d62b7baadc67531d4bada47b22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 08:31:49 +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
7974416ca3
Replace the SlicePreference with Preference am: 794fc58235
am: c054498357
am: eea3722ae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I5b10f3b3fb660abbe3afbaa9c296c25fad15c8f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 08:28:41 +00:00
SongFerngWang
6f36baf641
Replace the SlicePreference with Preference am: 794fc58235
am: c054498357
am: 04f9745471
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956
Change-Id: I90c33cbd1cae82d67808c1f64490a2e446422762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 08:01:00 +00:00
Fangqiu Su
064c80b470
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
am: 378e7af38e
am: 5ce99863ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: I62bb7a4c90c78cf5631bdd933f8f6e0e9f64797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:59:00 +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