PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,612 Commits 1 Branch 0 Tags
119ecdf838861979b5f67f3959d35bff3da5d56e
Commit Graph

100612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Presubmit Automerger Backend
119ecdf838 [automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a am: e39120e45c am: 94e495c664 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922

Change-Id: I3a264afd379f6e682250de744b1b15f5c5141e2c
 2022-03-04 03:11:53 +00:00
Presubmit Automerger Backend
94e495c664 [automerge] Use android.app.AlertDialog in SetupChooseLockGeneric 2p: cd517a654a am: e39120e45c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052922

Change-Id: Iec0a0fb6c595a7e1f416dd3c3937085989caf4f5
 2022-03-04 02:50:17 +00:00
PETER LIANG
278d6bb342 Merge "Fix that symbol at top left corner mismatch with remaining options in vision settings." into tm-dev am: ca3a45ebd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046258

Change-Id: I7dbac3c2a168218a9830360448909f874be3fda8
 2022-03-04 01:24:28 +00:00
Amy Hsu
b38fac221d Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046255

Change-Id: I586caad6daed97f3516e67a8c201af668e5b0634
 2022-03-04 01:24:14 +00:00
TreeHugger Robot
5663decd9b [automerger skipped] Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev am: 5ccb07df85 -s ours 
am skip reason: Merged-In Ieaa1c9d04a0a9805abb10025f170cd9283b4a906 with SHA-1 9540b9b15b is already in history

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

Change-Id: I185594dfe970883870d52fbe66305b2e159b3e34
 2022-03-04 01:22:36 +00:00
Karishma Vakil
eafa5b0666 [automerger skipped] [SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs am: e23cd8ad0b -s ours 
am skip reason: Merged-In Ieaa1c9d04a0a9805abb10025f170cd9283b4a906 with SHA-1 9540b9b15b is already in history

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

Change-Id: I581392bcef14d0834a5d67c766817d62131825a4
 2022-03-04 01:22:34 +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
caf7556e20 Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070265

Change-Id: I7df4cec3b8687f4fdfabb892db8e626086dacc85
 2022-03-04 00:29:07 +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
b4f80d69f3 Merge "Home Controls: Update subtitle for setting." into tm-dev am: b5fe96719c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16991603

Change-Id: I6d463669c7108abe80ec4341e7ac0936dbc72b9e
 2022-03-03 22:25:51 +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
3ac2e14863 Merge "Polish humanize strings for one-handed mode page" into tm-dev am: c5e6cfdc17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932279

Change-Id: I55f37f5514185ef3e1715acb83ae8ab4ca9bc1c9
 2022-03-03 22:14:52 +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
Karishma Vakil
bc84aad406 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-mainline-prod 2022-03-03 20:09:15 +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
TreeHugger Robot
3dc1a0a3b7 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev am: 02589e8b66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17069323

Change-Id: Ic144b00f6dcd546e3a51e6d99c4f45ee8ce8fd35
 2022-03-03 16:40:03 +00:00
TreeHugger Robot
02589e8b66 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev 2022-03-03 16:17:25 +00:00
PETER LIANG
5f0fe18050 Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev am: eb0a69cfcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050387

Change-Id: I435d1bde06f082e133519554d0910e72fa3fd78e
 2022-03-03 15:46:35 +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
Menghan Li
357a64ddb2 Merge "Remove font size & screen size setup flow instance" into tm-dev am: d3ec64104d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049975

Change-Id: I783bc27f99f3233bbd4cd42ec6e017fb741d677c
 2022-03-03 15:12:16 +00:00
Menghan Li
5da531f442 Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 4c167c01c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046369

Change-Id: Ia1631734c9d74e297bd46efe42ff69d3ee040b84
 2022-03-03 15:11:53 +00:00
Menghan Li
2519cdea5c Merge "Apply Glif theme before using dynamic color." into tm-dev am: 57ced74d51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033479

Change-Id: I0b1d895aa36ec3222742a118065b65c6c089a708
 2022-03-03 15:11:45 +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
aecc64d135 Merge "[MEP] The condition of "null point check" is wrong" into tm-dev am: cdb08ee92a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049216

Change-Id: Ifc4ed5aed400fa414a5bb6babbf7dd689275d0f4
 2022-03-03 12:54:47 +00:00
SongFerng Wang
13ed847fb4 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev am: 9ca62b2290 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049215

Change-Id: I11a7df9bad11d3324ff62e4710ce050ca4275e3a
 2022-03-03 12:54:40 +00:00
SongFerng Wang
110236db44 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev am: 822d099412 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17066725

Change-Id: Ic101b56aea5e44cf6ad3f191f299d04d386fd2a9
 2022-03-03 12:54:27 +00: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
3dc5c139cc Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052927

Change-Id: I7388330cc386f34ea14bba40fe9b2770b456fc35
 2022-03-03 12:19:41 +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
0249c0aff4 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049211

Change-Id: Ib503c69b72bb7a757bc74b5c8904a157d517abc3
 2022-03-03 11:47:24 +00:00
Bill Yi
44b4adcb04 [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: 18a9ad3101 -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: I4d8f732beb6e20657f47c32a26919f430d1db8d7
 2022-03-03 11:46:43 +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
2ac592070e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I9d3c8b4a0f6a31a603e16e440d77974b538b7db3
 2022-03-03 10:18:56 +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
73f7e22809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -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: I6f9d6abecd5421bd8feac731cdc43b48025f328d
 2022-03-03 09:59:36 +00:00
Bill Yi
d529bb6864 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -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: I1ed395fb5c77ab3d5fc130e2c6dfb9d68639ca17
 2022-03-03 09:58:57 +00:00