Commit Graph

25691 Commits

Author SHA1 Message Date
Eric Biggers
f8ca0a448c Remove CryptKeeper
Since Android 10, new devices have been required to use FBE (File Based
Encryption) instead of FDE (Full Disk Encryption).  FDE support was
already removed from system components such as init and vold.
Therefore, the CryptKeeper activity is no longer needed.  Remove it.

Note: this CL only removes CryptKeeper itself, i.e. the activity which
runs at boot time on devices that are using FDE or are being encrypted
with FDE in-place.  Later CLs will remove FDE-specific code from the
Settings app.

Bug: 208476087
Change-Id: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
(cherry picked from commit 43616ed3b6)
Merged-In: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
2022-03-07 22:18:32 +00:00
TreeHugger Robot
d0c2f30970 Merge "Revert "Remove the fallback AddSupervisedUserActivity."" 2022-03-07 18:41:45 +00:00
Matt Pietal
b8c30c7c5d Add user button UX update
Visually align all add user/guest icons between settings and
systemui. Both areas may tint and size the icons slightly differently.

Fixes: 219078700
Test: visual, use the multiple users settings page
Change-Id: Ic88d5b2197f402f130d6cfeb94bdb2bb1b6aa58c
2022-03-07 13:37:20 -05:00
Chaohui Wang
05bf0dcd6b Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2 am: 64774540f2 am: 768a07fb9e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297

Change-Id: If7386dd2208592387d6e2d8cba015c70b29b7951
2022-03-07 14:10:56 +00:00
Chaohui Wang
da41990efb Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2 am: 64774540f2 am: 768a07fb9e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297

Change-Id: Icc04050787294eda3076b3368415a85cfcc02163
2022-03-07 14:07:03 +00:00
Chaohui Wang
768a07fb9e Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2 am: 64774540f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297

Change-Id: I77465e94b94f274117f7555f580fc74fe9fb2762
2022-03-07 13:36:16 +00:00
Chaohui Wang
64774540f2 Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297

Change-Id: Icd2c470bbbc7144404b513beef5c6785eab8ca86
2022-03-07 13:06:22 +00:00
Chaohui Wang
18e2057de2 Merge "Fix Other default preferences alignment" am: c73dfdb858
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010297

Change-Id: Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f
2022-03-07 12:41:09 +00:00
Chaohui Wang
71f2d6d44c Fix Other default preferences alignment
Bug: 222333696
Change-Id: Icdcfff728c891b81d3976f3d625aa93b5154198c
Test: Manual on Pixel device
2022-03-07 09:36:14 +00:00
Stanley Wang
0b84af4f7d Merge "Fix the problem that the autofill could be searched." into tm-dev am: 96d82e3d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17043948

Change-Id: Id21ed0f41820ff296c9d46099857edb2ad49a5f5
2022-03-07 06:28:39 +00:00
Stanley Wang
9fe433e219 Merge "Fix the problem that the autofill could be searched." into tm-dev am: 96d82e3d05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17043948

Change-Id: I164e93b8d1db1ce5032ac83fb6ff6ea59bf9c3dd
2022-03-07 06:28:28 +00:00
Stanley Wang
96d82e3d05 Merge "Fix the problem that the autofill could be searched." into tm-dev 2022-03-07 06:11:52 +00:00
PETER LIANG
7e8bb4619b Merge "Move the "Dark theme" preference into the "Color and Motion" page." into tm-dev am: a92e6d8987
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050402

Change-Id: I15c8fc71a54898a0ee8207f910d24fa088df605a
2022-03-06 16:46:47 +00:00
PETER LIANG
3aae0b58d9 Merge "Move the "Dark theme" preference into the "Color and Motion" page." into tm-dev am: a92e6d8987
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050402

Change-Id: Id7daa4a35a37fc52804532a65c0775ff1ba879b2
2022-03-06 16:45:33 +00:00
PETER LIANG
a92e6d8987 Merge "Move the "Dark theme" preference into the "Color and Motion" page." into tm-dev 2022-03-06 16:23:08 +00:00
TreeHugger Robot
0bd1cdbee2 Merge "Apply proper icon tinting to dream icons" into tm-dev am: ccf275d55c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17086911

Change-Id: I99bd75c2e1ec33bd523f44bcefdd4a53f11332f8
2022-03-05 01:22:56 +00:00
TreeHugger Robot
c0d5dc01d5 Merge "Apply proper icon tinting to dream icons" into tm-dev am: ccf275d55c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17086911

Change-Id: I50f660d919be39e696c61b414fcb7780de21d30f
2022-03-05 01:22:50 +00:00
Lucas Silva
cf7338c1cf Apply proper icon tinting to dream icons
Test: locally on device
Bug: 222754771
Change-Id: I2998a37db4221f6beaeca591532ccc35d0992b86
2022-03-04 17:50:56 -05:00
Taran Singh
f4a312d1c5 Merge "Introduce developer option for Stylus handwriting" into tm-dev am: a10dc5280d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972176

Change-Id: Id0eb05463067ae69cddca56e2ffa80f8d62f4152
2022-03-04 18:32:29 +00:00
Taran Singh
2c52b9d3de Merge "Introduce developer option for Stylus handwriting" into tm-dev am: a10dc5280d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972176

Change-Id: I7ee37918aa8ae20fd7ba5520a522b569e0f43d2c
2022-03-04 18:32:17 +00:00
Taran Singh
a10dc5280d Merge "Introduce developer option for Stylus handwriting" into tm-dev 2022-03-04 18:21:20 +00:00
TreeHugger Robot
21d7d18a41 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-03-04 17:00:07 +00:00
Yasin Kilicdere
a30b27657b Revert "Remove the fallback AddSupervisedUserActivity."
This reverts commit 86f3500439.

Reason for revert: Real flow is not ready yet, so we still need the fallback activity.

Change-Id: I34dc5386ff8c18a62b4b11e25fd355a62602329f
2022-03-04 15:44:42 +00:00
Amy Hsu
784bbc2cde Merge "Add summary and footer message for the ScreenResolutionFragment." into tm-dev am: c8f9f36273
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17071745

Change-Id: If360c8fe27adfd629b982dc780d0846f80d1343a
2022-03-04 06:29:48 +00:00
Amy Hsu
c8f9f36273 Merge "Add summary and footer message for the ScreenResolutionFragment." into tm-dev 2022-03-04 06:24:08 +00:00
TreeHugger Robot
5e5acb2dc6 Merge "Change magnify typing setting item's string." into tm-dev am: 1adba841e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050395

Change-Id: If3cf747919bd0b74baa93efd86aeb40e1ebb6cab
2022-03-04 04:18:36 +00:00
TreeHugger Robot
a1a49817ec Merge "Change magnify typing setting item's string." into tm-dev am: 1adba841e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050395

Change-Id: I175270133231064e084b31eb8c34fe67c871bd51
2022-03-04 04:18:28 +00:00
TreeHugger Robot
1adba841e1 Merge "Change magnify typing setting item's string." into tm-dev 2022-03-04 04:00:14 +00:00
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
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
27ad4dcf23 Merge "Add ScreenResolutionController to Settings app" into tm-dev 2022-03-04 01:08:00 +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
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
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
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
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
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
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
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