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

100968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasin Kilicdere
d2eee96914 [automerger skipped] Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1 -s ours 
am skip reason: Merged-In I92acad938d79e21b45af99cc76ff411022b61f1b with SHA-1 ae871ba823 is already in history

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

Change-Id: I2bd60aa4b87b336706872e3eeebc938f6fe987be
 2022-03-04 00:27:33 +00:00
Yasin Kilicdere
f2f8e9add1 [automerger skipped] Fix Guest string was not translated in UMS.userWithName() am: 3fc4642ab4 -s ours 
am skip reason: Merged-In I92acad938d79e21b45af99cc76ff411022b61f1b with SHA-1 ae871ba823 is already in history

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

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

Change-Id: I11e51fb2450fcb8a2cddf64e90ca90737684b2ba
 2022-03-03 22:38:49 +00:00
Menghan Li
1e21260f5f Merge "Polish humanize strings for one-handed mode page" into tm-dev am: c5e6cfdc17 am: 3ac2e14863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932279

Change-Id: Id790a6bb0d9da8deb20ddfd995ef64d115c20d11
 2022-03-03 22:37:01 +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
fa02a9c117 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: I945889927fb9fdc08cbf0e20144818734e1b29b6
 2022-03-03 22:25:48 +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
bdacad3a52 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: If29016634c4bc0169a92c03db5a21c334185b42f
 2022-03-03 22:16:41 +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
78cedba480 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-mainline-prod am: bc84aad406 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17037303

Change-Id: Ia2008c5fc5b218b44278cde026ad87f0a9cad19c
 2022-03-03 20:31:00 +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
Aaron Liu
01d93a9b19 Merge "Home Controls: Update subtitle for setting." 2022-03-03 19:56:41 +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
Ricky Wai
2c01ba574b Merge "Apply restricted settings to notification access." 2022-03-03 17:47:02 +00:00
Aaron Liu
d0b77425a3 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
 2022-03-03 17:28:06 +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
SongFerng Wang
da07d7fce4 Merge "[MEP] psim's logical slot index is 0" 2022-03-03 17:13:34 +00:00
TreeHugger Robot
8ff5207e55 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev am: 02589e8b66 am: 3dc1a0a3b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17069323

Change-Id: I374542ed9704bf0947f9d0bf28fa37fce3b8ca33
 2022-03-03 17:01:26 +00:00
TreeHugger Robot
a59b484e77 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: I2fdb2beb2caa99feeae13574c4269f96b0e0f76f
 2022-03-03 16:41:19 +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
PETER LIANG
a65aba376c Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev am: eb0a69cfcc am: 5f0fe18050 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050387

Change-Id: I6afb6d42ff693484d4a8d79b3c568cc1deefce69
 2022-03-03 16:20:56 +00:00
TreeHugger Robot
02589e8b66 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev 2022-03-03 16:17:25 +00:00
PETER LIANG
5d210e13b6 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: Ieeeeba6e07bd1641ec6cb0a05bf6fcb31e6b2fb1
 2022-03-03 15:47:50 +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
Menghan Li
cd2b14d0b1 Merge "Remove font size & screen size setup flow instance" into tm-dev am: d3ec64104d am: 357a64ddb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049975

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

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

Change-Id: I8b1a1b2b19940039e323f54039dee91568455d8d
 2022-03-03 15:36: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
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
5658c482a2 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: I9f2fe85a7ddd78bc093878f8ad81ac19083d2735
 2022-03-03 15:12:06 +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
d2287c0bfe 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: I22321fb553136fa40e56699f2b91e656f509fc2a
 2022-03-03 15:11:41 +00:00
Menghan Li
57a77e263f 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: I1fb81f95f3b41ee6ec15d7187f219991aa38006b
 2022-03-03 15:11:32 +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
08ad4181c8 Merge "[MEP] The condition of "null point check" is wrong" into tm-dev am: cdb08ee92a am: aecc64d135 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049216

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

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

Change-Id: I6fb25caf51bbd5a5492305a8a9cd1ee0e2739a00
 2022-03-03 13:16:58 +00:00
SongFerngWang
b162438b5d [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
 2022-03-03 20:56:40 +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
2ea4a2ced2 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: Iefca187313b82a977d0aecae73f3ad3379880d47
 2022-03-03 12:54:40 +00:00