Piotr Wilczyński
139bc341f3
Revert "Back up the smooth display setting"
...
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3
Reason for revert: b/279215664
Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3
Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
2023-04-25 09:49:51 +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
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
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
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
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
Zaiyue Xue
d71ead4afb
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
am: 8892fd48ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: I20a63b7ebaa4eb61b1dfac97c95096641a5ea176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:37:29 +00:00
Zoey Chen
ea0f1b4bc6
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
am: c28a5c3431
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: Id57034121f9693355433080ec2567ce18d0ad70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:35:00 +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
Treehugger Robot
885801abc2
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: I934ee99c2e09b21e9a9c032111dbbf169bb533b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:29:03 +00:00
Treehugger Robot
9b25f5ac88
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
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519
Change-Id: Ia19da83e61ec2bfbfbbb61110c605c401dd0295e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 04:12:11 +00:00
Treehugger Robot
ea3a970826
Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev
2023-04-25 03:59:03 +00:00
Zaiyue Xue
796c2ef5ca
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: I6a72fe235b10dccd92cc56be7cf4e5f5e7a170f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:49:44 +00:00
Zaiyue Xue
8892fd48ca
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: Ic49b7f1c2382914ac42bd213629150f7dfc35dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:49:13 +00:00
Zaiyue Xue
43ea982e9e
Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776
Change-Id: Ieef0738903ed0528826866b4539f3ee521e8e800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:45:31 +00:00
Zaiyue Xue
65347f07ce
Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758
Change-Id: I41b385d28c5df0d83c6962bc297e28da5e61e26c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:44:43 +00:00
Zaiyue Xue
f3a3634aa5
Merge "Replace Screen system component time with device screen on time" into udc-dev
2023-04-25 03:32:02 +00:00
Zaiyue Xue
cfa374f997
Merge "Combine screen on time map into battery usage map" into udc-dev
2023-04-25 03:31:39 +00:00
Treehugger Robot
5f160e1562
Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e
am: ed9f22b78a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712
Change-Id: Id9f3db103c4b552b029fa5cd260aeb3a2a1f4965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:29:20 +00:00
Bill Yi
37fab052e0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
am: c4649b3ede
-s ours am: 0a2936d879
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712
Change-Id: I2b02d784210c68cbeb7209f50d6c0385c0f31360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:28:54 +00:00
Zoey Chen
c28a5c3431
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: I08689116c085fd322166bf2ef817a961b42a4cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:28:02 +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
d014b55e01
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959
Change-Id: Id22c108a702b279e8348f81fb6d84e7dd97501d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 03:25:49 +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
c31cf3d3b4
Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev
2023-04-25 03:00:20 +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
4c78f9cdf7
Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e
am: 26adf38f78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712
Change-Id: I2e0fdeb0b1ab5e53dd797dcf305cc8ed3ba3c49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 02:56:06 +00:00
Automerger Merge Worker
294c5a72bd
Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
am: c4649b3ede
-s ours" into udc-dev-plus-aosp am: 5e3e804b39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712
Change-Id: I8436defb2dbb3ca43c8461b8d02f51d71693da21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 02:44:00 +00:00
Bill Yi
4d378ddc21
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
am: c4649b3ede
-s ours am: 27bc142960
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712
Change-Id: If582596e076b37f138b6d635327f93e0ff635101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 02:43:57 +00:00
Fangqiu Su
0f1ca5b569
Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
am: a176782c18
am: 5ed8e6bc0e
am: 6b6044bedb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510
Change-Id: If1833c5dfb653dd2ef40ee62e04ad9e306865b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 02:41:54 +00:00