Commit Graph

104204 Commits

Author SHA1 Message Date
SongFerng Wang
a3d8337609 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 968da5c582
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: I5cc24a8c9aa23886ed740d08f7adc01c22e0753f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:55:41 +00:00
SongFerng Wang
968da5c582 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: Idbd1cd2b051e08b2a284c98f2343ce6acfe3a2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:39:48 +00:00
SongFerng Wang
fa5407c60f Merge "Changing the condition since the esim may be removable" into tm-dev 2022-05-27 06:23:16 +00:00
Hank Sheng
aa3a9c683a Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Icfff8b1937f72b2e58b697ebed4a939581c6672b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:50:28 +00:00
Chaohui Wang
bf0d192521 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: caabb4fe49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: If119cd32eb67b3b2868b568cee9887e0c6f5dd5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:49:57 +00:00
SongFerng Wang
1e24552f7f Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec am: 1ab90f4640 am: fc01fb0302
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598

Change-Id: I0bfe1fbd118a1b7cb66eca0efee0f220277b3131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:48 +00:00
Hank Sheng
3e3978ce80 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 0c8e9b6510
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I4f7589d5d38f61098468d37ad242b73f8af796c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:36 +00:00
Hank Sheng
349b36bb91 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id2d1766f508dd02f8412131c25f12f82d92a3833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:03 +00:00
SongFerng Wang
fc01fb0302 Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec am: 1ab90f4640
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598

Change-Id: Id9745becd41d7b74946bc57d07402e7c503dd9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:01 +00:00
Chaohui Wang
f9bfc59281 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: 4bcaccf8d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I1333dc9c30937b37a397138e69147e1b88286fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:01 +00:00
Hank Sheng
0c8e9b6510 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id4abc52bcccaec23a580f757b345c7d763ed1a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:46:43 +00:00
Hank Sheng
3dfcc708aa Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev 2022-05-27 05:32:47 +00:00
SongFerng Wang
1ab90f4640 Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598

Change-Id: I308ab424ad1acf881c0106de1007393e7bf0bff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:32:46 +00:00
Chaohui Wang
caabb4fe49 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I348919ec56e2f4ba3a28db987b205cddeb44463a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:26:26 +00:00
Chaohui Wang
4bcaccf8d3 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: Ic1dcc095cf52be3495a4d4863d27fed25157c068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:24:54 +00:00
SongFerng Wang
ed0f3c60ec Merge "Settings: Change array resource sim_color_light to an integer array" 2022-05-27 05:12:32 +00:00
Chaohui Wang
bc2e0f5fc4 Merge "Fix unable to toggle off Pause app activity" into tm-dev 2022-05-27 04:59:46 +00:00
Amy Hsu
2897d2fa42 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: Id18e737daee4dd59b79662ac1b23ca114e0af275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:39:20 +00:00
Amy Hsu
eca20b0820 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-05-27 00:17:19 +00:00
Tom Hsu
1db2f02c9e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I045ded0a1212e4baf53f4fd5577d072e70798387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:08:58 +00:00
Tom Hsu
448ca95a7a Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I5c427bb1620b6f31657524c944c0ab01fc33452a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:07:39 +00:00
Tom Hsu
806582197e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:41:44 +00:00
Tom Hsu
90875efc90 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:40:10 +00:00
Tom Hsu
f6ea9c99b3 Merge "Fix wrong summary string show on the network page." into tm-dev 2022-05-26 15:06:00 +00:00
tom hsu
d793e9512d Fix wrong summary string show on the network page.
Bug: 206742805
Test: local test, see b/206742805#4
Change-Id: I4fa9468e4f3b7d3671e383d3203b67636daa416c
2022-05-26 17:41:13 +08:00
Xupei Li
05301c7d1a Settings: Change array resource sim_color_light to an integer array
* It should be an integer array because its items are all color reference, and I found that the translations of this resource can lead to not show SIM color in languages other than English.

Change-Id: I6264abdfd0a49119e0170ae5c4bec437ad4c9e8f
2022-05-26 07:17:58 +00:00
Hank Sheng
bdda48ebe5 Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4.
screen shot:
https://hsv.googleplex.com/5487921525161984
https://hsv.googleplex.com/4853914928152576
https://hsv.googleplex.com/6492643191160832
https://hsv.googleplex.com/5915886260060160
https://hsv.googleplex.com/6321050657751040
https://hsv.googleplex.com/6222016362315776

Bug: 233036258
Bug: 233032365
Change-Id: If2bb4a82912bfdd18dc17ced11adc59eaf474bed
2022-05-26 07:17:36 +00:00
Amy Hsu
ea858a6afc [ScreenResolutionController] UI string update
Bug: b/230626771
Test: Check the string manually
Change-Id: Ic5c8ed146297bf1672e18e078aa8389738584cfb
2022-05-26 11:33:52 +08:00
SongFerngWang
948f512098 Changing the condition since the esim may be removable
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
2022-05-26 10:54:39 +08:00
Automerger Merge Worker
9c9743a464 Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours
2022-05-25 19:42:31 +00:00
Bill Yi
2366eddc23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icaa1f51c35fe27d1ed726f0802626fd4b38506be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:41:26 +00:00
Bill Yi
39208432c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadc2b45a431c1499cfc943cc857db724a19e7475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:41:22 +00:00
Bill Yi
76edd87fdc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a7f970657f3fef91be916632f5f2f587ddce09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:41:20 +00:00
Bill Yi
8c834259b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cad8be02796e43c1de7871986d76a689aa44c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:41:14 +00:00
Bill Yi
ef3cb063fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ef436fe88994dc48a334df7c7482e1311bc7db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:41:06 +00:00
Bill Yi
5ad0301bbe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f68df574588c168b697e0e3b9b241fc97dac49f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:41:01 +00:00
Bill Yi
acfd4d92c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7230fd9451b056a31af46917b357d9d89669625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:40:48 +00:00
Bill Yi
6ea19fdbb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08a136382c3273d0039f2df0c52065a6b4ff4ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:40:42 +00:00
Bill Yi
7cbd699752 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icac35db797bfdf2230c03a8c08b2bdd978fdb8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:08:09 +00:00
Bill Yi
142b69b865 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia539c2739edc240bccd6d45523972017bbd3cb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:07:48 +00:00
Bill Yi
d3f6a2192f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic04a2921b42cbf5292bdbb9d500257ac9f99ea52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:07:32 +00:00
Bill Yi
a34af9b081 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie822ccdbcab2f1bf46980f59847bf3d2e9320250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:07:22 +00:00
Bill Yi
6096b86e1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I909d66a4cb1412a9e924996fab95e63727a3acb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:06:43 +00:00
Bill Yi
c99eb87613 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I734c6876008c4eb19d6e7867b3bfe9ec5c56c4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:06:26 +00:00
Bill Yi
f344101fdb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I611a79eded17b14ff32f4e80df239a70e6eb0f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:06:13 +00:00
Bill Yi
9b4e0f0e67 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c7cec9a49b35cd390c817a66221921095cdbdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 19:05:54 +00:00
Bill Yi
b91e43c526 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-25 18:43:37 +00:00
Bill Yi
f4cb74b97a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-25 18:43:37 +00:00
Automerger Merge Worker
5c1527a95d Merge "Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 0d415d7cc6" into tm-d1-dev-plus-aosp 2022-05-25 15:06:55 +00:00
Chaohui Wang
658fe24a7e Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 0d415d7cc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672

Change-Id: I2f3f42147c3bab3b43f412f972f983ba978158fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 15:06:50 +00:00