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
Treehugger Robot
505b391a41
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
am: 885801abc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: I581752b752d96057ac4252cc8ebcc7d2b7b35a6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:38:28 +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
Fangqiu Su
29f3d022f7
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: I932c3dfca81798867d20625d7cc7007dabbec0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:07:10 +00:00
SongFerngWang
eea3722ae7
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: I23f42053cfeb5de0c55ae83aa9a0ec37b94db49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:05:42 +00:00
Fangqiu Su
5ce99863ea
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
am: 378e7af38e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: I5ddfb48e1809ce7c51163d30c0e283c3b3bc5c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 07:05:33 +00:00
Zaiyue Xue
e3578cc82b
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
am: 43ea982e9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: I4084549e11093ef5959b9f3748ab16b8ccc36e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:54:01 +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
Zaiyue Xue
902ece0ba3
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
am: 65347f07ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: I347d3bfef80232e5ac34b517c7fca16eee7e1930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:34:24 +00:00
Fangqiu Su
8d16e20d78
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350
Change-Id: I03bf08855b17f3a9d95fe00b4de68e97a62f4101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:24:07 +00:00
Fangqiu Su
378e7af38e
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450
Change-Id: I5e1a6f87cc9f32c18ce84fe4d2d5a3f95ff52f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:23:50 +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
26065748b7
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
am: d014b55e01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: I556f1d945af7fe1a6404c1ff04b53eae1c791f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 06:04:33 +00:00
SongFerng Wang
b0f9c2deae
Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp
...
* changes:
[automerge] Replace the SlicePreference with Preference 2p: 794fc58235
Replace the SlicePreference with Preference
2023-04-25 05:52:54 +00:00
Zoey Chen
017f916957
Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647
am: 221a58918c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358
Change-Id: I3e7c4eebf90bac40ec4628020c9f73b2289a06c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 05:52:15 +00:00
Fangqiu Su
2fba2c2316
Merge "Update uiautomator references in packages/apps/Settings/tests/perftests"
2023-04-25 05:48:52 +00:00
Fangqiu Su
68903eb9cb
Merge "Update uiautomator references in packages/apps/Settings/tests/uitests"
2023-04-25 05:47:24 +00:00
menghanli
95fbb04106
Fix the gradient drawable orientation is not mirrored for RTL alignment
...
Root cause: The orientation of the gradient drawable follows the view alignment. It should consider the text alignment.
Solution: Use getLayoutDirectionFromLocale# to get the text alignment to
set the correct orientation of the gradient drawable.
Bug: 278950655
Test: Manual test for RTL and LTR language
Change-Id: If94af75172ace137ac5168763f4cb47951f9e943
2023-04-25 05:43:29 +00:00
Treehugger Robot
14cd4ca61a
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
am: 9b25f5ac88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: Ib54b5f7b420eee42e0a64296744db0ece524e60d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 05:38:35 +00:00
Treehugger Robot
e4919398a9
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
am: 9f7e3227bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: I660e68c1ed0fe1f833901f93c3a08adfcd732c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 05:02:17 +00:00
Zaiyue Xue
10712a43b1
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
am: 86389502e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: Ia9cd7f752b4a70459ed3f3d60e960bd20bf6a0a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:56:58 +00:00
Zaiyue Xue
c92661d0e3
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
am: a795d58ace
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: If9b18192c34b93d4aa25780db72e037d3c1931a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:54:25 +00:00
Zoey Chen
9c0ae3aa1b
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
am: d14da56ab6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: Iac587978bc2de9ea4a1bbdbd6703919119acdbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:51:42 +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
Zaiyue Xue
ac87cc3cf9
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
am: 796c2ef5ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: I6ff79b0454a87151de6e1575e3ddd3ae69ed33a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:40:10 +00:00