TreeHugger Robot
a06d4dd336
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056402
Change-Id: Icd656b616ff9ace155d40bdadf854d91a1cd0a0f
2022-03-03 09:58:06 +00:00
TreeHugger Robot
1cda28b22c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056402
Change-Id: I5f370fcb8b39cec5fcb45fba89eb47a9dc5a2573
2022-03-03 09:58:05 +00:00
Bill Yi
2452ddb5a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056402
Change-Id: Idae44670190916b4b8df9e39f3f4fbbec0b08620
2022-03-03 09:58:04 +00:00
Bill Yi
71ea2a5db3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056402
Change-Id: I5bb2b62408df5cd9ef900d688a0eeee98334d0a2
2022-03-03 09:58:03 +00:00
TreeHugger Robot
7202ce3d9e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056905
Change-Id: I2a0b99ba69dc098105754b02d63a4ab0952ea68e
2022-03-03 09:57:16 +00:00
TreeHugger Robot
00008e601a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056905
Change-Id: Ibfb5bbab80cc06b0c76d7e1f092e5dfaf545b7da
2022-03-03 09:57:14 +00:00
Bill Yi
722677a2c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056905
Change-Id: I68de70d7b107222aa4d5778ff391202206568ef7
2022-03-03 09:57:11 +00:00
Bill Yi
5243b3ef11
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17056905
Change-Id: I107b306c67c96cefe7b64a6ae7201776f34c5588
2022-03-03 09:56:56 +00:00
Bill Yi
baecf5a51e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40
-s ours am: d6e99b7741
-s ours am: a6545359b1
-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: I1138abe17216c8a1528e39a7e062a8fbc64fe794
2022-03-03 09:56:29 +00:00
Bill Yi
01f5ecdb4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed
-s ours am: a93e2d89ec
-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: Icdd3b6d272a62082e2cd40e715cb20704f1ba625
2022-03-03 09:55:56 +00:00
SongFerngWang
e90d80cc52
[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId
...
1. The subscriptionInfo's getSimSlotIndex is logical slotId. The code
should compare it with uiccSlotMapping.getLogicalSlotIndex()
2. Rename the parameters for the readability.
3. The mobile network selection dialog did not be closed after user clicked.
Bug: 219951253
Test: manual test.
Change-Id: I7fef78547f4e6283791cd15a03275eaefeb50e3c
(cherry picked from commit 181f8179f1
)
2022-03-03 09:31:47 +00:00
TreeHugger Robot
57ff9d215e
Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod
...
* changes:
[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
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
SongFerngWang
ce8232d0a4
[MEP] The condition of "null point check" is wrong
...
The condition of "null point check" is wrong at the
SimSlotChangeHandler.
Bug: 222035986
Test: Build pass. maunal test.
Change-Id: I1b81faf082163643c1d17eae2f66d75b450288fe
(cherry picked from commit f64b2c09c0
)
2022-03-03 09:18:53 +00:00
SongFerngWang
a3b98f5d04
Fix the settings crash when SimDialogActivity is null
...
The PreferredSimDialogFragment did updateDialog after SimDialogActivity
was finished. It caused the settings crash. This is similar to b/184899699
Bug: 220803944
Test: build pass
Change-Id: I9a5964400a63053e362632944b9e7aa8ec1bbea8
(cherry picked from commit 70bf76a436
)
2022-03-03 09:18:39 +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
menghanli
a3c62aa1c7
Remove font size & screen size setup flow instance
...
Bug: 219882220
Bug: 214881137
Test: Build & flash; visual inspection; make RunSettingsRoboTests
Change-Id: I797738388a9fc3e8af21ccee3c1d34771b46126d
2022-03-03 07:43:37 +00:00
Amy Hsu
0dea418d57
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
Merged-In: I46d3be3b82ca512b8672efaa489df2cdaab26d6d
2022-03-03 07:23:10 +00:00
Peter_Liang
9d86fbc7a7
Fix that symbol at top left corner mismatch with remaining options in vision settings.
...
Replaced it with the visibility icon
Bug: 222242580
Test: manual test
Change-Id: I41682802678456d5fb93fb0e19d034e725e1da17
2022-03-03 15:09:53 +08: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
Karishma Vakil
e23cd8ad0b
[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs
...
Test: atest SettingsUnitTests
Bug: 219195246
Bug: 219078602
Bug: 218852160
Change-Id: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
Merged-In: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
2022-03-03 01:52:01 +00:00
Karishma Vakil
9540b9b15b
[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs
...
Test: atest SettingsUnitTests
Bug: 219195246
Bug: 219078602
Bug: 218852160
Change-Id: Ieaa1c9d04a0a9805abb10025f170cd9283b4a906
2022-03-03 01:22:45 +00:00
menghanli
b759790da1
Apply Glif theme before using dynamic color.
...
As changes are being made to remove the dependency between dynamic
color and the glifv3 theme, this sets the Glif theme before calling
trySetDymanicColor, as requested.
Bug: 219882220
Test: Build & flash; visual inspection
Change-Id: I4c28ea52411f3436c98e4689c7fa1784254fd572
2022-03-03 05:23:02 +08: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