Commit Graph

125966 Commits

Author SHA1 Message Date
Bill Yi
a18807d9ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b80d56cfc0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559281

Change-Id: I9c3201ad1377bc074940b211483a7c0f76630d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:19:23 +00:00
Bill Yi
aeacaaee64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe27600237 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557235

Change-Id: Ie42f1d09d6218ba3350b6971370fd554ea10f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:18:41 +00:00
Bill Yi
f108c63394 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400

Change-Id: I2e93a216a570bf7cd685e691e593ba8163089f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:13:06 +00:00
Bill Yi
0a31322199 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400

Change-Id: Iaf4243052f0b3cf46d02ca11aa64f9e48e8c9a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 20:11:33 +00:00
Justin Gross
a255995531 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: e8e2f86c4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I48070acd1f0395f42f4f796302cdb72364a63e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:53:25 +00:00
Justin Gross
c1bd5b34c2 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 5e2768327a am: 9a2fdfef3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: Idc094ece1794590de17a59b8b7bc24ac68aae41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:51:39 +00:00
Justin Gross
73dcd293c3 Merge "Enable vendors to add preference controllers in mobile network settings" into udc-dev am: 89e829e3dc am: 0e3ea95a58 am: b9d09dddda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23324419

Change-Id: I2753b78613de8d49c3dad49b4b5cd5ce058d0e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:49:39 +00:00
Treehugger Robot
6cb0b2c68e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-06-05 19:36:58 +00:00
TreeHugger Robot
719a4c645f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-06-05 19:35:48 +00:00
Justin Gross
e8e2f86c4c 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: I3463151328ed5ed16afb20616dd4f6e9653ac143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 19:27:32 +00:00
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
a80c569b36 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2ded1221447056932b184fad3f13750d46103fc0
2023-06-04 19:33:29 -07:00
Bill Yi
5dcde1cfde Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icd41c34edf3b72e7b66044b7f772ba15c85f85ec
2023-06-04 19:31:56 -07: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