TreeHugger Robot
8f84e7a9e7
Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
2p: 651ff7ece6
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
Import translations. DO NOT MERGE ANYWHERE
2022-03-03 09:26:19 +00:00
TreeHugger Robot
76d6cbc7b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-03 09:15:36 +00:00
TreeHugger Robot
088bb2a3bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-03 08:49:36 +00:00
Bill Yi
a6545359b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40
-s ours am: d6e99b7741
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055779
Change-Id: I47315f07e63678058eab99a25b69e870b20e1786
2022-03-03 08:40:04 +00:00
tom hsu
ea9e627c1c
[Panlingual] Improve UI can not show on at first.
...
- Settings take much time to get the info of app launcher entry. User
may not see the panlingual UI at first after boot to home.
- Does small refactor to somewhere.
Bug: 218416193
Test: local
Test: atest pass
Change-Id: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591
(cherry picked from commit cae20ce2f7
)
Merged-In: Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591
2022-03-03 08:39:20 +00:00
Bill Yi
a93e2d89ec
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055780
Change-Id: Ie0f44230c35fa3d1c41246ef929b3e188cf084c1
2022-03-03 08:38:53 +00:00
Bill Yi
35eb2aa055
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b
-s ours am: 657ad4c091
-s ours am: 73d2d988a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055741
Change-Id: Ib1b7bbcfafeb4ca7407a4face92e6501e507321a
2022-03-03 08:28:53 +00:00
Bill Yi
d6e99b7741
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055779
Change-Id: I65d1242ace5c200def66d4e7073859ee2c3958a2
2022-03-03 08:18:33 +00:00
Bill Yi
73d2d988a0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b
-s ours am: 657ad4c091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055741
Change-Id: I1361b00fa2fc1b147848d1cc370798b98382309a
2022-03-03 08:06:56 +00:00
Bill Yi
5bbd89324f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b
-s ours am: 657ad4c091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055741
Change-Id: If685e1fd20571c3f783fbc428e3154637fcf4846
2022-03-03 08:06:39 +00:00
Bill Yi
657ad4c091
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055741
Change-Id: I745a4ed776a72df02df79b29427f5a26f24573f2
2022-03-03 07:45:09 +00:00
Amy Hsu
5b631a6925
Merge "Add summary and footer message for the ScreenResolutionFragment."
2022-03-03 07:05:04 +00:00
Amy Hsu
7399a1f0f5
Merge "Add ScreenResolutionController to Settings app"
2022-03-03 07:01:40 +00:00
Amy Hsu
d633cd6b32
Add summary and footer message for the ScreenResolutionFragment.
...
Bug: b/199559703
Test: Check resolution switch UI in Settings app
atest SettingsUnitTests:ScreenResolutionControllerTest
atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c
2022-03-03 14:26:10 +08:00
Yasin Kilicdere
18252d9f88
Merge "Fix Guest string was not translated in UMS.userWithName()"
2022-03-03 03:24:18 +00:00
YK Hung
8b06549bd1
Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev am: c08c6c5c16
am: 74df068ec8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052912
Change-Id: I400e7dd5b0d4796fbeec911186529abc9a9ac2f4
2022-03-03 02:52:38 +00:00
YK Hung
c34a77143a
Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev am: c08c6c5c16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052912
Change-Id: I4e2c2dc4ca6e3181424b7a5bccc90a5db7a580a5
2022-03-03 02:31:41 +00:00
YK Hung
74df068ec8
Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev am: c08c6c5c16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052912
Change-Id: I9e9b55f896a7a8567e9ae8d6df287a162a0dd307
2022-03-03 02:30:29 +00:00
YK Hung
c08c6c5c16
Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev
2022-03-03 02:12:27 +00:00
Yasin Kilicdere
87c063e051
Merge "Remove the fallback AddSupervisedUserActivity."
2022-03-02 20:15:41 +00:00
Kweku Adams
49de547d55
Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862
am: c5d5358852
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518
Change-Id: I9e75f4bba5b0166e20138f64d6783efe89c1172a
2022-03-02 18:28:41 +00:00
Kweku Adams
fae96341ad
Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518
Change-Id: I5bf8224ff0979f64c5e531462ab03e161dca52df
2022-03-02 18:06:32 +00:00
Kweku Adams
c5d5358852
Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518
Change-Id: Ibaf91b0f7e54174222f080410e1a1b7377661258
2022-03-02 18:05:26 +00:00
Amy Hsu
b7b6ed91cf
Add ScreenResolutionController to Settings app
...
Settings for resolution switch
Bug: b/199559703
Test: Check resolution switch UI in Settings app
atest SettingsUnitTests:ScreenResolutionControllerTest
atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: I46d3be3b82ca512b8672efaa489df2cdaab26d6d
2022-03-03 01:56:00 +08:00
Kweku Adams
4a21c60862
Merge "Indicate min allowed bucket." into tm-dev
2022-03-02 17:55:45 +00:00
ykhung
069df8dcb0
Fix the broken tests on BatteryTipDialogFragmentTest
...
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Bug: 222229402
Change-Id: I9a6a8b69a1ef5c64bf8ce8807f83bac09f29ba8d
2022-03-02 16:55:55 +00:00
Bill Yi
ad345144ed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I68916107f4991d2ce5ee11a25c5f69f1e49390a7
2022-03-02 16:31:58 +00:00
Bill Yi
a9e8ee6e40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id83f405b8b044af0e5fd33278109d7a656b9ecc1
2022-03-02 16:28:16 +00:00
Bill Yi
0bfea8be54
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
2p: 651ff7ece6
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774
Change-Id: I95ac79be218c732c3655f7f5bae950b534ec0809
2022-03-02 16:25:05 +00:00
Bill Yi
651ff7ece6
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774
Change-Id: I6024ef9c60c715a2bd283a73e9f40b86803c85ae
2022-03-02 16:24:58 +00:00
Bill Yi
2ba7f57217
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If35ec49c403221a9c6079cf4b4e60ffddbfd5f2e
2022-03-02 16:24:43 +00:00
Bill Yi
0a5c4fc117
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2697d0b7917b58159e9c81382931c0555babe1e7
2022-03-02 16:20:36 +00:00
Bill Yi
48fce57d2c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I06944e12a02a336cefab0ca6a720fb6bcc3c5726
2022-03-02 16:08:19 +00:00
Bill Yi
11683d653b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb99c8c427c1bd2e4338fd2301568e4ce63a5b1e
2022-03-02 16:04:10 +00:00
Beverly Tai
f9c1013a35
Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a
am: 7fa5f43666
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663
Change-Id: I005cd7fe90cbf2d69d31d35e23f1a92ca47a4af8
2022-03-02 13:59:35 +00:00
Beverly Tai
690bce0c9a
Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663
Change-Id: I6f00e55fadccf302a3a9893ed6bf5e3a12b62bea
2022-03-02 13:38:32 +00:00
Beverly Tai
7fa5f43666
Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663
Change-Id: I07aa44ea1beb78c9687b5bc7744a7a1e88fa67d7
2022-03-02 13:37:23 +00:00
Edgar Wang
ca258ccd33
Use android.app.AlertDialog in SetupChooseLockGeneric
...
androidx.appcompat.app.AlertDialog will cause postiveButton and negativeButton become too close when the texts are longer.
Bug: 216442969
Change-Id: I39e84c1007c817399902034e853b2aeee1343adc
Test: visual verify
2022-03-02 13:35:03 +00:00
Beverly Tai
b2baaebb8a
Merge "Don't show the "When to show" PreferenceCategory" into tm-dev
2022-03-02 13:14:14 +00:00
Tom Hsu
f4465ae246
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
am: 293571f054
am: d626cb16f8
am: 2c8008b447
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: I579c40e07343f112b9b89631b376d761bf6717dd
2022-03-02 13:06:11 +00:00
Tom Hsu
2788e6e073
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
am: 293571f054
am: d626cb16f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: Iee2086215a2c7079831afaab626cbfab103a3957
2022-03-02 12:53:36 +00:00
Tom Hsu
2c8008b447
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
am: 293571f054
am: d626cb16f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: Iaacd7c9241e323ebb3478f745658a04d6c9b944a
2022-03-02 12:52:24 +00:00
Tom Hsu
d626cb16f8
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
am: 293571f054
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: Ib7b1d25aa8ff2e1f172eebf148790873cc292ded
2022-03-02 12:42:33 +00:00
Tom Hsu
293571f054
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
am: 0e8aed527f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: I874e3e478ce29dda24860a2e007279bf7ca77c47
2022-03-02 12:19:56 +00:00
Tom Hsu
0e8aed527f
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590
Change-Id: I5de3906942beb7efe557e3491468f91f9d67db48
2022-03-02 11:59:46 +00:00
Tom Hsu
d915b09e21
Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier."
2022-03-02 11:28:50 +00:00
TreeHugger Robot
ca34582b3f
[automerger skipped] Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717
am: adab78d3ce
-s ours
...
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 0607c5116c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I14b2811a97f5d860d6594615b2919bca9089cf3c
2022-03-02 10:28:46 +00:00
TreeHugger Robot
bc76e74e2d
[automerger skipped] Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717
-s ours
...
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 cda892df85
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I24d0882afc3afedd0d707ebed547a7ec5e980e5c
2022-03-02 10:06:58 +00:00
Mill Chen
3a524f2d33
[automerger skipped] Cache mechanism for Storage page with work profile am: 0607c5116c
-s ours
...
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 cda892df85
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I9c30d728ea89520a77d923e6debb461ac823bf31
2022-03-02 10:06:57 +00:00
TreeHugger Robot
adab78d3ce
Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445
Change-Id: I882442bb7b4e230294882d7d0439af16a2ae15af
2022-03-02 10:06:12 +00:00