ykhung
f2b7f7afaa
Resolve IncompatibleChargerTipTest test fail am: aae628ab64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784768
Change-Id: I65a71d68d5690025bb7228af6a536756d0d8cabf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 12:39:02 +00:00
ykhung
921a2f45a0
Resolve IncompatibleChargerTipTest test fail am: aae628ab64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784768
Change-Id: I4b79f54a99213ace69661413dfb67909867a0dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 12:38:58 +00:00
ykhung
aae628ab64
Resolve IncompatibleChargerTipTest test fail
...
Bug: 246960554
Test: presubmit & manual
Change-Id: I4d1c481f90d55009255d7bdf6e822613831c9822
2023-03-05 10:10:40 +00:00
YK Hung
071231d27c
Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev am: ba9bd128c7
am: 79e26c3228
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784767
Change-Id: I890ff221407bed588d366cce52a6e3192d5f2fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 06:04:53 +00:00
YK Hung
2220e6c377
Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535
am: e784c520f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766
Change-Id: Ia6baf8464cffc4ef8dfd853937161325f01739cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 06:04:38 +00:00
YK Hung
4364d80786
Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev am: ba9bd128c7
am: 2691e0b2f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784767
Change-Id: I95996dcdd4e74b0b7c69a30b60bd04d55031dcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 06:03:47 +00:00
YK Hung
8ee200e8b5
Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535
am: 5c37ab9c6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766
Change-Id: Ib093152c9a45fed127a1e7e99ee8cdc6a8a393d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 06:03:34 +00:00
YK Hung
2691e0b2f3
Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev am: ba9bd128c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784767
Change-Id: I766cac77e8d4f70bf00208fc676f29595f9fe360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 05:48:36 +00:00
YK Hung
79e26c3228
Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev am: ba9bd128c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784767
Change-Id: Ib274c132a34a5399d6426dab5acfdb352f9e16d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 05:48:33 +00:00
YK Hung
e784c520f3
Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766
Change-Id: I519a2533bc1916741cd89f8d0cc9dc4b1d933f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 05:28:04 +00:00
YK Hung
5c37ab9c6d
Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766
Change-Id: I1801f2db01ee7585a01f71dd879e900def56618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 05:28:03 +00:00
YK Hung
ba9bd128c7
Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev
2023-03-05 05:17:32 +00:00
YK Hung
edb03e5535
Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev
2023-03-05 05:12:27 +00:00
ykhung
ecb91b7d36
Update the incompatible banner tip icon based on UX refinement
...
Bug: 246960554
Test: presubmit & manual
Change-Id: I5fab570e1a8947d70a7923338c4e74caa67bcd2e
2023-03-05 11:30:19 +08:00
ykhung
3ae46cd6ec
Add a new config for checking BatteryManager show/hide rule
...
Bug: 271387663
Test: presubmit
Change-Id: If24b5e6de630afe972ad7ff7af866cb587db0a56
2023-03-05 10:54:01 +08:00
Treehugger Robot
98a648d4f2
Merge "Add getSubscriptionId API" am: 7813c4a9a3
am: 5e84729b10
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383
Change-Id: I4229a085aa2f088bbff7c6335d59b76c32a66283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 19:40:21 +00:00
Treehugger Robot
5e84729b10
Merge "Add getSubscriptionId API" am: 7813c4a9a3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383
Change-Id: I8d3584c77241e2d273bccf1d97ad592501d9afd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 19:10:17 +00:00
Treehugger Robot
7813c4a9a3
Merge "Add getSubscriptionId API"
2023-03-04 18:38:35 +00:00
Wenhui Yang
c4feb95a8c
[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
am: ee77d819f9
-s ours am: 87dca7b54e
-s ours am: 98ac7b2f33
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I41f15a5c456df424171683f93410275527e296cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 08:42:24 +00:00
Wenhui Yang
3ba77caac0
[automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
am: 59090cbb65
-s ours am: 9c3060dea8
-s ours am: be0ccb8e01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I0dbf036f9ad2958a2d3c12430cc6e1e4c0db9642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 08:42:23 +00:00
Wenhui Yang
495874a2a8
[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
am: ee77d819f9
-s ours am: 87dca7b54e
-s ours am: ad26c2873b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I9552dcc057c34421a6b790d595fcec7dcf884c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 08:10:04 +00:00
Wenhui Yang
8b614052e1
[automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
am: 59090cbb65
-s ours am: 9c3060dea8
-s ours am: c1d0064a70
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I1fd422d4fb0b50955b04c9757adf76e2aeb2929e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 08:07:36 +00:00
Wenhui Yang
98ac7b2f33
[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
am: ee77d819f9
-s ours am: 87dca7b54e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: Ic14a8d09ca7a26e358352c7966d7270f9dee2e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 07:37:15 +00:00
Wenhui Yang
be0ccb8e01
[automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
am: 59090cbb65
-s ours am: 9c3060dea8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I3948c110d3947130b9b86735c9771fa42b0697f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 07:37:09 +00:00
Wenhui Yang
ad26c2873b
[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
am: ee77d819f9
-s ours am: 87dca7b54e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: Ie97acfcf00275f997d5c51f74d85511096e30f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 07:33:18 +00:00
Wenhui Yang
c1d0064a70
[automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
am: 59090cbb65
-s ours am: 9c3060dea8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I5e808296d92c9c3e3132ccb646e754b7e9873aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 07:29:35 +00:00
Wenhui Yang
87dca7b54e
[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
am: ee77d819f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: Ide9d559a8cb50d90b637b2f56008f7f47b58d393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 06:30:03 +00:00
Wenhui Yang
9c3060dea8
[automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
am: 59090cbb65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I6f155805d208da88c68df632023ee0c681d9e49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 06:29:54 +00:00
Jack Yu
bc71ee5ece
Add getSubscriptionId API
...
The old getSubId or getSubscriptionIds return multiple sub ids
per slot index, which is not possible in today's implementation
because the slot index here refers to the logical slot index,
which is also known as phone id, or the logical modem index. In
today's telephony, one logical phone can only have one
subscription at one time, so does the modem.
Bug: 239607619
Test: Manual
Merged-In: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
Change-Id: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
2023-03-03 19:40:50 -08:00
Yu-Ting Tseng
631105a2af
Remove CACHED_PROC_STATES which is unused.
...
Test: atest ProcessStatsTest
Bug: 271160990
Bug: 260242581
Change-Id: I62ed4eac102cc8f9c9ce7ab1325410cddc834ca1
2023-03-03 14:42:12 -08:00
Lucas Dupin
29ea690bef
Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc
am: b81af50666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631
Change-Id: I8062dfe5a83ddfc9abe47706a21449553eb6a71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 20:44:28 +00:00
SongFerng Wang
af10cf7e3e
[automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
am: d427c0d2d1
-s ours am: 8153d6c491
-s ours am: 2b26f1314f
-s ours
...
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540
Change-Id: Idc52e986b3b739a97b15a8b349c71933376b3891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 20:41:54 +00:00
YK Hung
a4b6b43879
Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3
am: 2300bbd5a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487
Change-Id: Ib0bfe810fbd19ab0abec75adda1a44a50b5f7617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 20:11:39 +00:00
Lucas Dupin
514aeeb058
Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc
am: 2aff6c3484
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631
Change-Id: I370ec766048281f8cf0cfc7fec3ed7dab51573d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 20:02:53 +00:00
SongFerng Wang
dc076c97f0
[automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
am: d427c0d2d1
-s ours am: 8153d6c491
-s ours am: df1ed13f98
-s ours
...
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540
Change-Id: I94d567d0b519ea5305d4629a79c49b6efc809f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 20:00:50 +00:00
Angela Wang
c037a03d74
Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a
am: e49da0f0c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804
Change-Id: I5f889e999d8fa15198120a541820f72a639a4bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:59:53 +00:00
YK Hung
d7b3234962
Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3
am: 78be1d4dee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487
Change-Id: Ibffa6745725db3cca8d4005b0d3c1a5f842f5fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:59:42 +00:00
Angela Wang
592a2cb394
Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a
am: 6d6652eeec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804
Change-Id: I16d6f03f01934deafc70298dd709e08bc7b0f117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:58:30 +00:00
YK Hung
a839516881
Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c
am: 60ccbd9056
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047
Change-Id: If0451b0f13783dd7d361f2f574cbcb2a99f5b1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:47:06 +00:00
YK Hung
106ef93c1c
Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c
am: 04bc21c347
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047
Change-Id: Ic61b01af3ff9207598b3ee43cc4b23765717c888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:44:31 +00:00
Wenhui Yang
ee77d819f9
Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I418f39b4328603ddd96a5d0a4cc1ed347ac70aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:37:08 +00:00
Wenhui Yang
59090cbb65
[DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I4222ff4118ab7e6da39cf777f676104092ac96b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:37:00 +00:00
Lucas Dupin
2aff6c3484
Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631
Change-Id: I2a42a67681613992474c86cbf2e7744a67bf7a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:27:27 +00:00
SongFerng Wang
df1ed13f98
[automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
am: d427c0d2d1
-s ours am: 8153d6c491
-s ours
...
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540
Change-Id: Ia35941823a7904b4dae2d86dc07a4d7f40f03789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:25:25 +00:00
YK Hung
78be1d4dee
Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487
Change-Id: Ied630d92f743dc431e27dad52f47505615ddead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:23:26 +00:00
Lucas Dupin
b81af50666
Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631
Change-Id: I032d15df9b5a4fd62d3fa40f1c8acb0b36cd2105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:21:34 +00:00
Angela Wang
6d6652eeec
Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804
Change-Id: Ica3ac8f7ec7416baad3f10edbdb95f4c18085cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:20:06 +00:00
YK Hung
60ccbd9056
Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047
Change-Id: I1520ec312f75534c46927e126eb025a9fe9cda51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:04:14 +00:00
SongFerng Wang
2b26f1314f
[automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
am: d427c0d2d1
-s ours am: 8153d6c491
-s ours
...
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540
Change-Id: I0db8fbac952436a26b36d51aa1e8d4d3d10fa8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 18:56:43 +00:00
Lucas Dupin
f9f6b80efc
Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev
2023-03-03 18:45:22 +00:00