Pawan Wagh
7dcfe67cae
Show progress bar till the applyPayload returns am: 9be05afc88
am: 0aebae8d79
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: Ibaf92a15e52ad5e7f1834210196c94d521ad90d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:06 +00:00
Pawan Wagh
ba35fbc238
Call update engine to apply payload am: 008842edeb
am: d2110a76a7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I2e0013a3f62fa945005f6ceaf2ff3ca184c2ba8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:25:02 +00:00
Pawan Wagh
8e5eff37a9
Developer option for booting with 16K pages am: 8996ca9768
am: acd2de2533
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: I8882b9feb7b34567de5f8a65d8932dac42446529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 21:24:56 +00:00
Bill Yi
aa1f04042b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acdbb25cd7
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25869875
Change-Id: Iabc4018006534088dafb0c09a955f5226cb39e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 20:12:51 +00:00
Pawan Wagh
0aebae8d79
Show progress bar till the applyPayload returns am: 9be05afc88
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345
Change-Id: I713b313d751c063cea3835c7396859f40a61645d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:13 +00:00
Pawan Wagh
d2110a76a7
Call update engine to apply payload am: 008842edeb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951
Change-Id: I21c7ec553c2a9276df3f9b352ad3f106f816a3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:09 +00:00
Pawan Wagh
acd2de2533
Developer option for booting with 16K pages am: 8996ca9768
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817
Change-Id: I28136f884536a8bbf5aa10cd04ab597595e9f223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-12 19:51:02 +00:00
Pawan Wagh
9be05afc88
Show progress bar till the applyPayload returns
...
Displaying a progress bar till the applyPayload from update_engine
returns.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 298214075
Change-Id: Ic8cf4df700505e7f10185ee0f08225411c6621e5
2024-01-12 17:14:03 +00:00
Pawan Wagh
008842edeb
Call update engine to apply payload
...
Calling update engine to apply payload provided from boot_otas and
reboot on success. Updating different dialogues for 4k prompt.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Enable16kPagesPreferenceControllerTest
Bug: 295573133
Change-Id: Iab90a2c2fae5f6aefce95b2306db91c7b056d9f7
2024-01-12 17:13:31 +00:00
Pawan Wagh
8996ca9768
Developer option for booting with 16K pages
...
Adding developer option to boot with 16K compatible kernel. Adding
resources, layouts and dialog classes for 16k option. This needs
to integrated with update engine to make OTA switch happen.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 294614538
Change-Id: I3a24fed059eee99407e3486a7254285e0e4a251c
2024-01-12 16:51:16 +00:00
Bill Yi
acdbb25cd7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If73569771424eaeb9341c61542af25645b96c4d7
2024-01-11 19:00:07 -08:00
SongFerng Wang
8663deec9b
Using ACTION_SIM_CARD_STATE_CHANGED to detect simSlotMapping is complete am: e51d8515c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25809891
Change-Id: I0bed6503fbce6204b2da75f6dc25364148f1ce8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-05 07:23:19 +00:00
SongFerng Wang
e51d8515c0
Using ACTION_SIM_CARD_STATE_CHANGED to detect simSlotMapping is complete
...
Sometime modem can't return the GET_SIM_STATUS immediately, so that the settings send the sim switching too early after simSlotMapping.
Bug: 291733084
Change-Id: If547c8b02020bc86c83915334e29945176a4ee9f
Test: tester will test it manually.
(cherry picked from commit ba2a86ad9f
)
2024-01-05 03:38:30 +00:00
Bill Yi
b3f7a40d56
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 8842653554
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25779194
Change-Id: I02e26f664275df1c8011407c8a6bb7ab2bb4ee76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 01:27:49 +00:00
Bill Yi
ae2b1116ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7fc1fb810b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25779194
Change-Id: I22db0b71b25c28e5738953b6db607b387a6fc513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 01:27:41 +00:00
Bill Yi
1f7e32c467
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c0acadf03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25779192
Change-Id: I54a4e5f42e2c48a3a17969fb01ed0c13302ad5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-04 01:27:20 +00:00
Bill Yi
8842653554
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-01-04 00:10:27 +00:00
Bill Yi
7fc1fb810b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3529df91c2d48ac11fec8f8755dfb3c6faad7a60
2024-01-02 14:37:53 -08:00
Bill Yi
8c0acadf03
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie43dc95d487e328a20d88df957d9239a6cbf4bfa
2024-01-02 14:35:04 -08:00
Bill Yi
2b402bdd2c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2a63e773ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754875
Change-Id: I0322b8315d89bac557b7547fd15d106bf6f41db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 23:02:40 +00:00
Bill Yi
451f6817e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d62083085
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754875
Change-Id: I75b61ec0bd8d8b376b61223b6a42a192766b590f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 23:02:36 +00:00
Bill Yi
c2702b560b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2b26b470ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754578
Change-Id: I44d559aa0103827ec78fa37a9116b0365c4a28d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 23:02:32 +00:00
Bill Yi
96dc00525b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa1bfc7d04
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754578
Change-Id: I4c6e569abc2d5ac5eef6d2e331e33bc14d129e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 23:02:22 +00:00
Bill Yi
d2b4db0ac5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7af5937f90
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754576
Change-Id: I271fb4a230c55266fa8ce4b09c52fb1d295ad025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-27 23:02:05 +00:00
Bill Yi
2a63e773ce
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-12-27 22:26:10 +00:00
Bill Yi
2b26b470ec
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-12-27 22:26:10 +00:00
Bill Yi
7d62083085
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idf84f378f3b906951a36c3c61ef7e9da9dbd9092
2023-12-26 16:29:46 -08:00
Bill Yi
fa1bfc7d04
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If2aa5e6d3d7c3c72f973ab142ac09dccfa4703ef
2023-12-26 16:26:50 -08:00
Bill Yi
7af5937f90
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I21ddd8b4ba7ef60791f304d38a466d80d6ec3073
2023-12-26 16:23:29 -08:00
Jason Chiu
2a29d67710
Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23
am: 36dc648ca5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507
Change-Id: If9497561d0efa2311a18886105a1ce02709373be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-26 09:18:32 +00:00
Jason Chiu
36dc648ca5
Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507
Change-Id: I5b61af6e8d265bc62603554ff0236a62ba7f94a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-26 08:48:01 +00:00
Jason Chiu
4f4bb89a23
Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main
2023-12-26 08:08:27 +00:00
Jason Chiu
706907b7b2
Finish HomepageActivity when it's not the root of a task and not singleTask.
...
HomepageActivity should be the first activity in a task, or be launched
in singleTask mode. Finishing it will bring up the previous activity in
the task.
Fix: 297857732
Fix: 309045575
Test: robotest
Change-Id: Iddcba1652060d755693dd20d0e350e3d6c1ae138
Merged-In: Iddcba1652060d755693dd20d0e350e3d6c1ae138
2023-12-26 02:08:14 +00:00
Bill Yi
1dec72e3ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 063e533a49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25648511
Change-Id: I2d9085b2009c0f0d445a72055925637fdd12d90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 18:53:44 +00:00
Bill Yi
23a484796f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e9cfebc93
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25648511
Change-Id: I49ea01cbe49c14d11bc8269eddebb425e825ec21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 18:53:29 +00:00
Bill Yi
ba227a44b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2300cd1453
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25647469
Change-Id: Ia0065653f0154b8d18d41e2e7ac53922377fb44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-15 18:53:13 +00:00
Bill Yi
063e533a49
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-12-15 18:18:42 +00:00
Bill Yi
2300cd1453
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b88806e0d579e17355af3107724987fb657faf9
2023-12-13 16:21:13 -08:00
Bill Yi
4e9cfebc93
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If08f28f0fb48e5969968d05b1533e89892dc64dc
2023-12-13 16:18:14 -08:00
Xin Li
c118ba99fa
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc
-s ours am: 5cd5689267
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I41ee10d0c4c60f9777907275260404156def2d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:05:10 +00:00
Xin Li
36a2f3cc93
[automerger skipped] Merge Android 14 QPR1 am: 784b56d43f
-s ours am: 7d2f4be0ba
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I07ee696955ad4f1b7f5952539da6f6c299328429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:02:17 +00:00
Xin Li
5cd5689267
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: I0295ace8868448969c6e97d817ac85a042f3452b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:19:27 +00:00
Xin Li
7d2f4be0ba
[automerger skipped] Merge Android 14 QPR1 am: 784b56d43f
-s ours
...
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2866434
Change-Id: Ie0309426ebc4ba2c6db303e08d87c4b940802db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:16:28 +00:00
Xin Li
32cdca80cc
Merge "Merge Android 14 QPR1" into main
2023-12-09 00:11:59 +00:00
Xin Li
784b56d43f
Merge Android 14 QPR1
...
Merged-In: I22fa193e9846fdb998810c93c9c26344a40d89a9
Bug: 315507370
Change-Id: I4a3a51affce75afe081a0cc9197e0034e34fe82d
2023-12-08 13:14:21 -08:00
Xin Li
e72aefc106
[automerger skipped] Merge UQ1A.231205.015 am: 4f1ec8cb8a
-s ours
...
am skip reason: Merged-In I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c with SHA-1 fdf80bd5c9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25590246
Change-Id: I8326d3adfea2de2f71271b65f4673bf9dc251125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 08:21:19 +00:00
Xin Li
4f1ec8cb8a
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I22fa193e9846fdb998810c93c9c26344a40d89a9
2023-12-07 15:48:03 -08:00
Bill Yi
62cd606a6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f07dacd7f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25562049
Change-Id: I5d63b75d278ba416ae939443c5e3f0225bafa88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-07 00:38:45 +00:00
Bill Yi
f07dacd7f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If70d2c088105c88880860b4283014a43522b2db9
2023-12-05 13:11:59 -08:00
Chaohui Wang
4cccd18ef8
Check isSimHardwareVisible earlier am: b731e63096
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25498055
Change-Id: I19c7182a8207c48f99bc6730a88c10e839b5e6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-05 07:12:53 +00:00