Commit Graph

100904 Commits

Author SHA1 Message Date
Amy Hsu
372bbdcf9c 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
(cherry picked from commit d633cd6b32)
Merged-In: Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c
2022-03-04 02:45:15 +00:00
PETER LIANG
ca3a45ebd3 Merge "Fix that symbol at top left corner mismatch with remaining options in vision settings." into tm-dev 2022-03-04 01:21:58 +00:00
Amy Hsu
27ad4dcf23 Merge "Add ScreenResolutionController to Settings app" into tm-dev 2022-03-04 01:08:00 +00:00
TreeHugger Robot
5ccb07df85 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev 2022-03-04 00:57:08 +00:00
Yasin Kilicdere
9f54f436d1 Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev 2022-03-04 00:03:00 +00:00
Presubmit Automerger Backend
e39120e45c [automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922

Bug: 216442969
Change-Id: I8b98a48ad8d34b965f0d3dadb06247fdb84572bf
2022-03-03 23:37:07 +00:00
Edgar Wang
cd517a654a 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-03 23:36:55 +00:00
Aaron Liu
b5fe96719c Merge "Home Controls: Update subtitle for setting." into tm-dev 2022-03-03 22:20:54 +00:00
Menghan Li
c5e6cfdc17 Merge "Polish humanize strings for one-handed mode page" into tm-dev 2022-03-03 21:25:02 +00:00
Aaron Liu
ea34e9ab42 Home Controls: Update subtitle for setting.
Change subtitle for device controls setting to be less generic. Need to address merge conflicts here.

Bug: 216110204
Test: Manual
Change-Id: I848d052461f412c51109c39b811252c64b19440a
(cherry picked from commit d0b77425a3)
2022-03-03 19:56:57 +00:00
Yasin Kilicdere
3fc4642ab4 Fix Guest string was not translated in UMS.userWithName()
This CL reverts the changes made in ag/14282598 since the issue is
solved from the source and removes 'String name' parameter from
UM.createGuest() calls.

Bug: 185309160
Test: atest UserDetailsSettingsTest
Change-Id: I92acad938d79e21b45af99cc76ff411022b61f1b
Merged-In: I92acad938d79e21b45af99cc76ff411022b61f1b
(cherry picked from commit ae871ba823)
2022-03-03 18:32:48 +00:00
SongFerngWang
0b948c827b [MEP] psim's logical slot index is 0
psim's logical slot index is 0, so changing the API and adding test
cases.

Bug: 221839363
Test: atest UiccSlotUtilTest
Change-Id: I1588bd4a2f552a6b41844883b6ad50f1bfec95de
(cherry picked from commit b162438b5d)
2022-03-03 17:14:44 +00:00
TreeHugger Robot
02589e8b66 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev 2022-03-03 16:17:25 +00:00
PETER LIANG
eb0a69cfcc Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev 2022-03-03 15:25:44 +00:00
Alex Johnston
4a75dc192c Change default USB configuration to a RestrictedPreference
Test: manual with TestDPC and Settings
      DefaultUsbConfigurationPreferenceControllerTest
Bug: 201519976
     205996517
Change-Id: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-03 15:09:06 +00:00
Menghan Li
d3ec64104d Merge "Remove font size & screen size setup flow instance" into tm-dev 2022-03-03 14:40:17 +00:00
Menghan Li
4c167c01c7 Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev 2022-03-03 14:39:55 +00:00
Menghan Li
57ced74d51 Merge "Apply Glif theme before using dynamic color." into tm-dev 2022-03-03 14:39:34 +00:00
Edgar Wang
0dba77bc2f Ignore test case of SetupSkipDialogTest
Bug: 222467830
Test: robotest
Change-Id: I5a4c2de830b90c3d7e83b751f09114b4ce2737fd
2022-03-03 21:53:02 +08:00
SongFerng Wang
cdb08ee92a Merge "[MEP] The condition of "null point check" is wrong" into tm-dev 2022-03-03 12:36:59 +00:00
SongFerng Wang
9ca62b2290 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev 2022-03-03 12:36:43 +00:00
SongFerng Wang
822d099412 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev 2022-03-03 12:36:20 +00:00
Edgar Wang
f0a675f07d Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev 2022-03-03 11:56:54 +00:00
Tom Hsu
f966c34a41 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev 2022-03-03 11:36:08 +00:00
Bill Yi
18a9ad3101 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40ac285e6b052159ede32d3ff07f8f900d8ec406
2022-03-03 11:27:15 +00:00
Bill Yi
702e26be61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f28b44ef8df97b7a8378a6406ea002ba6314aa6
2022-03-03 10:51:36 +00:00
Bill Yi
8f3d7d5a77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie77cff6452d3575640d7a610febe563736e4dd22
2022-03-03 10:31:28 +00:00
TreeHugger Robot
5a5bfcf48d Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I02091b9fa75c14c15da42fd83e1aeb10391b92d6
2022-03-03 10:08:36 +00:00
Bill Yi
40e23845e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife884fc14969c0babdd6948edff1781a75e6cfb6
2022-03-03 10:08:18 +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
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
Joshua Mccloskey
e761b75cd0 Updated icon for reverse-landscape udpfs
Test: Manual
Fixes: 193709296
Change-Id: Ic2a7ee16032b5233832f601f18fac2304f2b0f70
2022-03-03 07:53:16 +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