Justin Gross
|
9a2fdfef3a
|
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 5e2768327a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I0188769c0ee14b22c008a99f96c2a4b438aa56d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-05 19:27:20 +00:00 |
|
Justin Gross
|
b9d09dddda
|
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I4bed3fa8bf3800894c159b2e6c11361ee1cf0cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-05 19:25:12 +00:00 |
|
Justin Gross
|
5e2768327a
|
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: I17069f20447108b5346fc7246288e8ba93b35f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-05 18:37:33 +00:00 |
|
Justin Gross
|
0e3ea95a58
|
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419
Change-Id: Id08742370d36beeacedcad6538c8482c465b0324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-05 18:36:49 +00:00 |
|
Treehugger Robot
|
065885622b
|
Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343
Change-Id: Iee500ce4346a8554a37a4ff98ae5f3775b3ad411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-05 18:03:19 +00:00 |
|
Justin Gross
|
89e829e3dc
|
Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev
|
2023-06-05 18:00:15 +00:00 |
|
Treehugger Robot
|
dbec7ba7fb
|
Merge "Use custom action key icon" into udc-qpr-dev
|
2023-06-05 16:56:35 +00:00 |
|
ykhung
|
7dec603727
|
Make the estimator cache logic is the same as SysUI flow am: 53f48c4a97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557957
Change-Id: I42405b0eef20370cc6a838d1040149f9a635d391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-05 07:02:11 +00:00 |
|
Bill Yi
|
16b5dd96c2
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I71ddf8ba696942441a9aba613960a7cbac4c1b28
|
2023-06-04 18:47:42 -07:00 |
|
Bill Yi
|
ea2e6b3670
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7229c084aa7704cde5a57d7635bd0fb2113fca6
|
2023-06-04 18:46:55 -07:00 |
|
Bill Yi
|
1b5824f6c9
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia19dd8b4893160c436ed2a4b548b1c0a18ac5642
|
2023-06-04 18:44:23 -07:00 |
|
Bill Yi
|
e1108d7d99
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6d9fb22b34aa948324f12dbd8421a53d3d180f11
|
2023-06-04 18:42:33 -07:00 |
|
Bill Yi
|
d152c7b1bf
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4fe08ee7dc7f803451ff0389a2587a5c99d1023e
|
2023-06-04 18:40:52 -07:00 |
|
ykhung
|
53f48c4a97
|
Make the estimator cache logic is the same as SysUI flow
Ensure the remaining time estimator cache logic is the same as SysUI
https://source.corp.google.com/android/frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryControllerImpl.java;l=375-386
Test: presubmit
Fix: 285747156
Change-Id: If7218dc70792aafaec45c71018897bed80df7f3d
|
2023-06-05 01:39:41 +00:00 |
|
Bill Yi
|
506e105fdb
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I61f515a3a5cd45df467240ef7cc38e098fd184ae
|
2023-06-04 18:39:29 -07:00 |
|
Bill Yi
|
f346881098
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I32cdd728af994f151117d2a96c1f5e27508eba9e
|
2023-06-04 18:38:42 -07:00 |
|
Bill Yi
|
7d99401b8e
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I855db4675b33516b1bd38cb58406a9daa8ca188e
|
2023-06-04 18:37:48 -07:00 |
|
Bill Yi
|
fe27600237
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I00c2c563b2687f49c85e0774c1a8b279e8781ede
|
2023-06-04 18:36:19 -07:00 |
|
Bill Yi
|
b80d56cfc0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I359de73314ea608d66cdc8dc77fd3396a104dc02
|
2023-06-04 18:34:48 -07:00 |
|
Bill Yi
|
8cb99dd3e3
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id8d72c85deddd4bbb0a4fb49b71c6c929bf253db
|
2023-06-04 12:26:25 -07:00 |
|
Bill Yi
|
59cfc8ae14
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib2c29e2e9c358a14b63738fba13a296d7d49f9ed
|
2023-06-04 12:24:22 -07:00 |
|
Bill Yi
|
c66d6726f0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaf1f93706a94bc587237b4367b9ca4ddc629101a
|
2023-06-04 11:33:42 -07:00 |
|
Bill Yi
|
c96c00059d
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I37bbb2e912db7d52298bf0143d6e087a26b421f2
|
2023-06-04 11:25:20 -07:00 |
|
Bill Yi
|
bd46bde1e6
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a4b1fcadd0684e5bcb46fcae5f58ba0e4bdd351
|
2023-06-04 11:21:16 -07:00 |
|
TreeHugger Robot
|
3362e7999e
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 4834abe241
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I77fd8d9224b1d9428aea7b14ba8924fd8cedead5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 23:12:36 +00:00 |
|
TreeHugger Robot
|
965278dc4d
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: a7b0933819 am: f716dc591a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Iedeec213bb906a6a65f0ac8e85297e80742bc60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 23:12:10 +00:00 |
|
TreeHugger Robot
|
f6f0c966a9
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51 am: 565f4b5730
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I045be75427f44db3ca778391bb64cbfe81822c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 23:10:47 +00:00 |
|
TreeHugger Robot
|
f716dc591a
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: a7b0933819
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Idd15de9c7629187ee022bc01b16fba419857cb66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 22:23:53 +00:00 |
|
TreeHugger Robot
|
4834abe241
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 22:23:17 +00:00 |
|
TreeHugger Robot
|
565f4b5730
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: I2bc382165446ca91d4662b151174463781ae5c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 22:21:34 +00:00 |
|
TreeHugger Robot
|
a7b0933819
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ic495c899a15cfbfaca7edb76f4be6cb79c8f8c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 21:37:08 +00:00 |
|
TreeHugger Robot
|
f0503e2a51
|
Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978
Change-Id: Ifdc153ead7f9c45046bf5df96b1d44cd576f561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 21:36:40 +00:00 |
|
TreeHugger Robot
|
25d24e0cf0
|
Merge "Restrict SimDialogActivity" into udc-dev
|
2023-06-02 20:41:47 +00:00 |
|
Jason Chiu
|
13873ddeda
|
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: 8d939360ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: I232a076a6c8a494da3c067f68ebe712f54438612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 18:54:44 +00:00 |
|
Jason Chiu
|
2191eb763e
|
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: ac614d26f0 am: 52df3a5f64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: Idd220dad1ed9e5ce5dfa75c99d704a1b80cf01fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 18:40:51 +00:00 |
|
Jason Chiu
|
9b0c989265
|
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa am: 390c348d4b am: 2b8067e797 am: d103243e8b am: 933d3279a1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: Ia57214d2c4211882b68df1f06a87ac83715ff11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 18:04:17 +00:00 |
|
Chaohui Wang
|
6186231aa9
|
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 2f3132c132 am: 27000f18aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: I19477cb7eeef63d2a9d027cf373295100c0c010f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:46:02 +00:00 |
|
Chaohui Wang
|
a310e7235d
|
Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 64d1cc6a13 am: 5ba8511fc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426
Change-Id: I4a3aaeeccc8f00536aaaee57d2d1941e1816c0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:45:50 +00:00 |
|
Chaohui Wang
|
e334639a8d
|
Merge "Hide Show System on SPA version App languages" into udc-dev am: 122ba16792 am: 3916082b8a am: 6a8c87c194
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486250
Change-Id: I2eddb5749e516e0ce2cbf73ec9469a7ab53b62a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:45:19 +00:00 |
|
Chaohui Wang
|
d6819273ca
|
Merge "Fix padding issue on Scan QR code screen" into udc-dev am: 68995792c2 am: 129e80c7d8 am: 623f93a963
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484426
Change-Id: I21125bdcaa1ff6b6b90dc3692f08021efec5896e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:45:07 +00:00 |
|
Treehugger Robot
|
425c4da7d2
|
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 3b13b37028 am: 0339f763b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: Ie34377a0e1a0a64316e332d1cf3bd499eaa31097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:45:00 +00:00 |
|
Yanli Wan
|
1d471854ed
|
Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: 4764e9a4da am: 41b7cb56c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457
Change-Id: I962e90adab7d3b7907b60792e3f58e36d8e8a23f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:44:50 +00:00 |
|
Treehugger Robot
|
73147518c9
|
Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev am: 47d3cfe635 am: 91737c0b3b am: da647c56cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23517077
Change-Id: I698ef6a1545d96394c7031d188e975aa06ccd27c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:44:41 +00:00 |
|
Yanli Wan
|
cdffe9016b
|
Merge "Update the string of Settings preference for device lock" into udc-dev am: 7cc3625678 am: f120e3d563 am: c7ba6daae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23522457
Change-Id: Ie4bf3dc092e64cdf6777544866c7cd1a08fad6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:44:33 +00:00 |
|
TreeHugger Robot
|
1b59061046
|
Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9bf am: f2e08c31a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040
Change-Id: I3d54d75cb4163cdfd36fb4fdd5f955953ea13619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:44:22 +00:00 |
|
TreeHugger Robot
|
d286605885
|
[automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 07366fc787 -s ours am: e523ee97f3 -s ours
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: I720b5bda9dead7b447583f98e33d055da9d9542b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:44:14 +00:00 |
|
YK Hung
|
0441e7a70d
|
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 2bfdf17d69 am: 439c0b0057
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: Iacc6b876579d3b22b90be5fdf3ca634e00c51c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:09:06 +00:00 |
|
TreeHugger Robot
|
0c91d2948e
|
[automerger skipped] Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" into udc-dev am: 641d07244e am: 01360b3729 am: 4d22ed26ff -s ours
am skip reason: Merged-In I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841 with SHA-1 7a8602dce9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23518324
Change-Id: Iba9a25b829a1b3a22aa41801279c593f01ee1d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:08:55 +00:00 |
|
YK Hung
|
5ceb227f59
|
Merge "Update incompatible charger checking rule" into udc-dev am: bfc4637d09 am: 4eabcdea6d am: 9ec0a502ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23484351
Change-Id: Ic98d4c1d3d945b669725abdda95b8668c15232d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 17:02:00 +00:00 |
|
Jason Chiu
|
3812b37db7
|
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" into udc-dev am: b2ed35b2ae am: a8142278e9 am: d48ba61155
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486247
Change-Id: I068fb33918911b727b529dd80db9f7f138c17b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-02 16:40:13 +00:00 |
|