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

100876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amy Hsu
75b30a469c [automerger skipped] Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf23 am: b38fac221d -s ours 
am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 0dea418d57 is already in history

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

Change-Id: I50fe88270a2417b7a8b56e3498f6163a452826b3
 2022-03-04 01:44:50 +00:00
TreeHugger Robot
aaa96bc887 [automerger skipped] Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-dev am: 5ccb07df85 -s ours am: 5663decd9b -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: I206983fbf56236b15ceb400cdaa6bb77a670e3fc
 2022-03-04 01:44:38 +00:00
Karishma Vakil
c30da6d134 [automerger skipped] [SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs am: e23cd8ad0b -s ours am: eafa5b0666 -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: I7f6425921f93e83142b8a5572da87451b4f3ad9c
 2022-03-04 01:44:34 +00:00
PETER LIANG
69c7484596 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: I17ae8d83a2629e64458f500c5000f8f15d8094b6
 2022-03-04 01:24:32 +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
Amy Hsu
970595deb2 [automerger skipped] Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf23 -s ours 
am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 b7b6ed91cf is already in history

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

Change-Id: Ib28fcf2d27e95d82dbf607a71351603b571a7fed
 2022-03-04 01:24:11 +00:00
Amy Hsu
552d9fc08c [automerger skipped] Add ScreenResolutionController to Settings app am: 0dea418d57 -s ours 
am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 b7b6ed91cf is already in history

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

Change-Id: I1558a0c9c2eeb76e4cd7791e7a58345223487f06
 2022-03-04 01:24:06 +00:00
TreeHugger Robot
b5c665e2c1 [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: Ia9e0fdcb7f61cd8b4920673c43bc0845a90428d3
 2022-03-04 01:23:17 +00:00
Karishma Vakil
314d6893d1 [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: If080f0a78180708df3ca989546838c07086e84eb
 2022-03-04 01:23:16 +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
413157cfe5 [automerger skipped] Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1 am: caf7556e20 -s ours 
am skip reason: Merged-In I92acad938d79e21b45af99cc76ff411022b61f1b with SHA-1 3fc4642ab4 is already in history

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

Change-Id: I3c84dac09527213021a2c2ff505b0c717754db56
 2022-03-04 00:50:13 +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
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
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
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