Commit Graph

4976 Commits

Author SHA1 Message Date
Peter_Liang
d57ae61aa9 Fix that icons overlapped in Preview at Display size and text screen under Vision Settings.
Change the app grid view from 4 columns to 3 columns, and app count from 8 to 6.

Fix: 222241141
Test: manual test
Change-Id: I66c131be77971c9ccc3ee796a6732ff65aac01a5
2022-03-17 17:31:02 +08:00
Hugh Chen
d004638343 Fix connected device detail page slice items are in smaller font size
- Increase font size of slice items

Bug: 223502042
Test: build pass
Change-Id: I48ac0ff9734c467cc9c1cd0fa0e2b40ea02ecfa3
2022-03-17 07:05:52 +00:00
SongFerng Wang
100d741cc8 Merge "Add the battery information into device details header" am: 907b3fc4be am: 8ca446a175
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2028085

Change-Id: Iacf7f957deb9d3f57088c5bd49e2b0ac70cf88f8
2022-03-17 04:59:47 +00:00
SongFerng Wang
907b3fc4be Merge "Add the battery information into device details header" 2022-03-17 03:11:20 +00:00
Eric Biggers
6a8f883aee Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8 am: c749aa3ed1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I919c43559218b13c0f6188e04f104f3051a28731
2022-03-16 19:33:25 +00:00
Eric Biggers
c749aa3ed1 Merge "Remove support for converting from FDE to FBE" am: 804dc16a03 am: 629db5f9f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2026904

Change-Id: I6d5b12840e9940ecb5d076591ca8514b0085f438
2022-03-16 18:57:35 +00:00
SongFerngWang
b76eb99d4a Add the battery information into device details header
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
Merged-In: Ib9f4c388c369dc374c43dd399111e02b5555159b
2022-03-16 18:00:50 +08:00
SongFerng Wang
45436a025c Merge "Add the battery information into device details header" into tm-dev 2022-03-16 09:44:42 +00:00
SongFerngWang
57dd3bc444 Add the battery information into device details header
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
2022-03-16 12:17:15 +08:00
Eric Biggers
b21d2216ac Remove support for converting from FDE to FBE
Devices that launched with Android 10 or later require FBE (File Based
Encryption) from the beginning, so there's no need to support converting
to FBE after the fact anymore.  This was only ever a developer option,
so it probably wasn't used much.  And in any case, it's not used
anymore, as isConvertibleToFBE() is hard-coded to return false.  Besides
the fact that FBE has been required for several releases now, this
functionality was only ever available on devices that use FDE (Full Disk
Encryption), but FDE support has been removed from Android.

Therefore, remove this unused code.

Bug: 208476087
Change-Id: Ia765d6827e6144153c4e2a253b146ef2c75ca6fe
2022-03-15 17:27:53 +00:00
Bonian Chen
0d6d1eea28 [DataUsage] The drop down menu and gear icon not aligned
Correct the alignment in layout.

Bug: 220322345
Test: local
Change-Id: Ia98eb84c5946466f90d813b9c846c1811f2ec10b
2022-03-14 07:29:04 +00:00
TreeHugger Robot
48eb6726c3 Merge "Show lock icon in restricted settings dialog" into tm-dev 2022-03-10 16:38:09 +00:00
Yasin Kilicdere
ba6ee82d59 Revert "Revert "Remove the fallback AddSupervisedUserActivity.""
This reverts commit a30b27657b.

Reason for revert: Now we can remove the fallback activity since the real flow is ready

Change-Id: Iecedbf588412547feecc6de36c89236097f8c236
2022-03-10 11:34:40 +00:00
Chaohui Wang
8ff1d57150 Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd am: dc70876ddb am: b6799b65c7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419

Change-Id: Icf0a5207f8cbb41b6cfac623b34e12b58fb76b24
2022-03-10 08:43:15 +00:00
Chaohui Wang
b6799b65c7 Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd am: dc70876ddb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419

Change-Id: Id0eb4d409cb9a434e608cc255056de08e9428050
2022-03-10 08:22:21 +00:00
PETER LIANG
b4e91fa866 Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev 2022-03-10 05:40:17 +00:00
Chaohui Wang
34261e25a7 Clean up unused profile_select_tablayout.
Change-Id: If1f58f13a8cf14bf078bce16c23fed6726ff223a
2022-03-10 04:57:00 +00:00
Menghan Li
3c01414b4c Merge "Clean up accessibility quick settings "tooltips" for singular purpose" into tm-dev 2022-03-10 03:55:30 +00:00
menghanli
075364f147 Clean up accessibility quick settings "tooltips" for singular purpose
Bug: 220655084
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsTooltipWindowTest LaunchAccessibilityActivityPreferenceFragmentTest ToggleAccessibilityServicePreferenceFragmentTest
Change-Id: I771ad407b04375be2679c2237a970ee418b9bf37
2022-03-10 07:51:48 +08:00
Ricky Wai
ffc747e820 Show lock icon in restricted settings dialog
Bug: 221847335
Test: After applying restricted settings, the dialog shows the icon now.
Change-Id: If4b55d4320956625141973c337ae7ef2a3bd8dbc
(cherry picked from commit 18602ea97a)
2022-03-09 16:51:35 +00:00
Peter_Liang
2bfb31c877 Apply the settings lib style into the reset button of "Display size and text".
Bug: 222415445
Fix: 220638395
Test: manual test
Change-Id: I001c9eff69f46f4ba142c3e5e428b1a92169ba7d
2022-03-09 13:42:07 +00:00
Eric Biggers
c300a01bf4 Remove FDE support from accessibility settings
With FDE (Full Disk Encryption), secure start-up (i.e. requiring a PIN /
pattern / password to boot the device) was incompatible with
accessibility services.  Thus, the accessibility settings would ask the
user to disable secure start-up when enabling an accessibility service.

Now that FDE support has been removed in favor of FBE (File Based
Encryption), this is no longer necessary.  Remove it.

Bug: 208476087
Change-Id: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
(cherry picked from commit b4060ef65b)
Merged-In: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
2022-03-08 17:13:22 +00:00
Eric Biggers
922a11f659 Remove CryptKeeperSettings
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.

For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings.  Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
(cherry picked from commit 36609c18d1)
Merged-In: I3ce9894291ea1f1886f21980a86a92bfce38038a
2022-03-08 17:13:22 +00:00
Eric Biggers
438c3af097 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-08 17:13:22 +00:00
PETER LIANG
3ccdcd433a Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev 2022-03-08 15:17:10 +00:00
Peter_Liang
5bd3568078 Fix that the preview text in "Text and reading options" page is too small.
Add the default values into respective TextView

Fix: 222413847
Test: manual test
Change-Id: I1da8a6ea08007c8988ae8dcf798f1645128ac906
2022-03-08 14:13:44 +08:00
Eric Biggers
1d48df59e5 Remove FDE support from accessibility settings
With FDE (Full Disk Encryption), secure start-up (i.e. requiring a PIN /
pattern / password to boot the device) was incompatible with
accessibility services.  Thus, the accessibility settings would ask the
user to disable secure start-up when enabling an accessibility service.

Now that FDE support has been removed in favor of FBE (File Based
Encryption), this is no longer necessary.  Remove it.

Bug: 208476087
Change-Id: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
(cherry picked from commit b4060ef65b)
Merged-In: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
2022-03-07 22:18:48 +00:00
Eric Biggers
9b18c5d081 Remove CryptKeeperSettings
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.

For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings.  Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
(cherry picked from commit 36609c18d1)
Merged-In: I3ce9894291ea1f1886f21980a86a92bfce38038a
2022-03-07 22:18:38 +00:00
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
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
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
Menghan Li
d3ec64104d Merge "Remove font size & screen size setup flow instance" into tm-dev 2022-03-03 14:40:17 +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
Yasin Kilicdere
86f3500439 Remove the fallback AddSupervisedUserActivity.
Rollback the changes done in ag/16388725 and ag/16709333

Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"

Change-Id: I75b85df50a3caff55375ad261a97225377644a38
2022-03-01 21:59:23 +00:00
Edgar Wang
f97f5f7005 Update workprofile TabLayout for Material Next style
1. Upgrade ViewPager to ViewPager2 which provided better support.
2. Apply new TabLayout style

Bug: 193249384
Bug: 195655281
Bug: 193249173
Bug: 179738624

Test: manual

Change-Id: I905ee82f315316c2bf4b73bf5581423878e2c3e7
2022-03-01 18:07:43 +00:00
Jason Chiu
bcfd5b3d65 Make homepage search bar remain persistent when scrolling
- Modify the scroll flag
- Add a background to avoid overlapping

Fix: 218825541
Test: visual
Change-Id: Ice88c1bb324780e72332dd810e654b1d17daafae
Merged-in: Ice88c1bb324780e72332dd810e654b1d17daafae
(cherry picked from commit 7cf0819b41)
2022-03-01 07:30:08 +00:00
TreeHugger Robot
792e514bd0 Merge "Update dream preview button text color" into tm-dev am: 3afc9399f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17015304

Change-Id: I2a5a4554e4d316903679fb5bd4a322f67d75e8e9
2022-02-25 21:49:36 +00:00
Lucas Silva
5b19c1200f Update dream preview button text color
Bug: 219761637
Test: locally on device
Change-Id: I6b98b400c31ca5a296f5ed095b52ff7d8ea36c44
2022-02-25 13:13:59 -05:00
Lucas Silva
bafbbf4fdc Merge "Add dream descriptions to dream settings UI." into tm-dev am: 4b6efee1a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989262

Change-Id: I2dac154f7a7b45dd1c7843193c4a22880a596b7a
2022-02-24 20:39:52 +00:00
Lucas Silva
c7709aebb3 Add dream descriptions to dream settings UI.
The dream descriptions will now be shown underneath the title, if the
dream has provided one.

We also cleaned up the icon view, instead merging it with the title view
to ensure proper alignment between the icon and title.

Bug: 221078654
Test: locally on device
Test: atest DreamPickerControllerTest
Change-Id: I00fd69c294f1a5fbcbc5392eba342f2896f6d9ed
2022-02-24 16:25:24 +00:00
Presubmit Automerger Backend
cf27889718 [automerge] Fix incorrect colored bar when task bar is hidden 2p: 39c8905f4c 2p: c4594d9948
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16972170

Change-Id: I50854b6409bfad67fba529f2dad7190979ebe4cd
2022-02-23 10:41:29 +00:00
Tsung-Mao Fang
39c8905f4c Fix incorrect colored bar when task bar is hidden
Set backgorund color on content id view instead of homepage view.
Also setup edge to edge for the homepage.

Fix: 215440529
Test: See correct ui on the two pane mode and regular phone.
Change-Id: I2d5988a489410e9620137bd6cf9607768787d4fc
2022-02-23 10:41:14 +00:00
Jason Chiu
042fa89fac Merge "Make homepage search bar remain persistent when scrolling" 2022-02-18 08:29:58 +00:00
Jason Chiu
7cf0819b41 Make homepage search bar remain persistent when scrolling
- Modify the scroll flag
- Add a background to avoid overlapping

Fix: 218825541
Test: visual
Change-Id: Ice88c1bb324780e72332dd810e654b1d17daafae
2022-02-18 14:16:34 +08:00
Edgar Wang
74096fa66a Merge "Replace SettingsSpinner with Spinner" 2022-02-17 14:10:40 +00:00
Edgar Wang
fa5ab2e268 Replace SettingsSpinner with Spinner
Bug: 219610512
Test: manual
Change-Id: Ib8562a64299a6cb36f8225199f9432cb81e8e9f2
2022-02-17 02:16:27 +08:00
Lucas Silva
c0ff1c1ff8 Merge changes I49f4b5d6,I8eb5047d
* changes:
  Add accessibility annotations to dream settings.
  Update dream settings strings to match latest UX mocks
2022-02-16 15:15:18 +00:00