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
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
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
Peter_Liang
566ba7c3c3
Move the "Dark theme" preference into the "Color and Motion" page.
...
Bug: 221168615
Test: manual test
Change-Id: Ia2d88c0ee03fed97843fef39c92fe22367c67e71
2022-03-03 11:17:34 +08: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
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
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
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
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
9e9a39d717
Merge "Cache mechanism for Storage page with work profile" into tm-dev
2022-03-02 09:49:42 +00:00
Peter_Liang
51f1225954
Polish and humanize the summaries for "Remove animations" and "Large mouse pointer".
...
Fix: 221167118
Test: manual test
Change-Id: If5ba34ddcfed4d2b7b9166381f928f5943a5d22e
2022-03-02 08:25:14 +00:00
Daniel Hsieh
b72d5aba2d
Change magnify typing setting item's string.
...
Change magnify typing setting item's title and description.
Bug: 221952566
Test: Manually, I check the string on the screen.
Change-Id: I3cc9885aaf99745ce9edfef08ec122294487e8d0
2022-03-02 07:38:38 +00:00
Arc Wang
f74e1195a4
Merge "Only show 2-pane deep link when homepage is available" into tm-dev
2022-03-02 07:20:00 +00:00
Stanley Wang
e11d9e9ef3
Fix the problem that the autofill could be searched.
...
PreferenceCategory will not be indexed by default. The auto fill
category use the AutofillPreferenceCategory class in the xml so
it will be indexed.
The solution is to create a controller to replace AutofillPreferenceCategory.
Fix: 185914894
Test: manual adb test to see the log
Change-Id: Id0e3bcc33a3132434a6bd1fe91e1c6915116d06d
2022-03-02 14:02:56 +08:00
Tsung-Mao Fang
88bff1ebc5
Merge "Fix unable to scroll to the bottom page" into tm-dev
2022-03-02 03:13:01 +00:00
Edgar Wang
ab22c72319
Merge "Update workprofile TabLayout for Material Next style" into tm-dev
2022-03-02 02:28:03 +00:00
menghanli
ba498a8205
Show different tooltips for QS features auto-added and non-auto-added
...
- Update the illustration
- Update the subtext
Bug: 220655084
Bug: 218968108
Test: manual testing
Change-Id: I01fb191d1a39d15d7dda0eef67459005887f5a77
2022-03-02 02:01:31 +00:00
Arc Wang
9ba80e76b3
Only show 2-pane deep link when homepage is available
...
DeepLinkHomepageActivity is disabled by default and may be
enabled after receiving the PRE_BOOT_COMPLETED broadcast.
On some virtual devices, DeepLinkHomepageActivity may not
be enabled for test cases. This is a fallback option to
show a full screen Activity to pass tests.
Bug: 221149428
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I4bbe785176fe3fe8831484141aff7367e4ca25ce
2022-03-02 01:24:14 +00:00
Colin Cross
54a9fd4e17
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
am: e23884eed9
am: f21625fe80
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: I6e850608c5454ce80562a956074bc9ebe5c1597d
2022-03-02 00:55:39 +00:00
Colin Cross
f21625fe80
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
am: e23884eed9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: If16d05bf70b7802cfc0aaf917949b62231147058
2022-03-02 00:34:33 +00:00
Colin Cross
e23884eed9
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011
Change-Id: If31ca44328dd6794977bba78e7c07d89e7d1c796
2022-03-02 00:13:00 +00:00
Colin Cross
9c59242102
Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions"
2022-03-02 00:01:05 +00:00
Adam Bookatz
f886179845
Merge "Fallback Home doesn't restart on keyboard change" into tm-dev
2022-03-01 22:51:27 +00:00