Commit Graph

120174 Commits

Author SHA1 Message Date
Edgar Wang
ae2d8a7682 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f am: 962a3932d0 am: a782dd0423
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: I4a2d869ab5df76f0c8ca82159ff30cd7bdef2a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 22:40:09 +00:00
Edgar Wang
b37b1dc2e1 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f am: 962a3932d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: Ib6c0bdc168410c61cd83c7052a549fd207168de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 21:23:41 +00:00
Edgar Wang
a782dd0423 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f am: 962a3932d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: I63d4ba1fa7676d7c83e9a9ac4e838e17e662a434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 21:20:19 +00:00
Edgar Wang
962a3932d0 Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d am: 420cc9114f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: Ib679057af4da62fe48d94cebc344f477ce438a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 19:51:11 +00:00
Edgar Wang
420cc9114f Merge "Move tablet resources to product overlay folder" into tm-qpr-dev am: 27d53afa8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21472866

Change-Id: I894b14ab6af7a20469c57b275780597db09d8225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 18:52:37 +00:00
TreeHugger Robot
1e6c6b6f7c [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours am: f144ed6e00 -s ours am: 8872d5e8a4 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: I508d5e29fa98385f6fdd473c9ab2cb566e90ce8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 18:45:46 +00:00
TreeHugger Robot
44f70036b5 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours am: 82736a7d86 -s ours am: b7ba47c9b2 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: I3832412752cd2239a0e0f0fe89084aed6b1689c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 18:44:24 +00:00
Edgar Wang
27d53afa8d Merge "Move tablet resources to product overlay folder" into tm-qpr-dev 2023-02-17 18:10:59 +00:00
TreeHugger Robot
8872d5e8a4 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours am: f144ed6e00 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: If4c670b0093914650a01822eec2361f0b85b5976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 17:37:11 +00:00
TreeHugger Robot
9bdca81393 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours am: f144ed6e00 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: Id0658333fcfd4b7b82afcdb94a419c2433557444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 17:36:37 +00:00
TreeHugger Robot
b7ba47c9b2 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours am: 82736a7d86 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: I480a87927d4fa75df8a18974065a4458ecb62b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 17:36:21 +00:00
TreeHugger Robot
71cc63dcf2 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours am: 82736a7d86 -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: I97f9354c70ead2c5ba7969f8e5b2f5e04d8860d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 17:33:53 +00:00
Carbo Kuo
bd18ca11d0 Merge "Migrate the About page in Settings." 2023-02-17 16:32:54 +00:00
TreeHugger Robot
f144ed6e00 [automerger skipped] Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440 am: 966de44fd9 -s ours
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 cf3199fc9e is already in history

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

Change-Id: I0d754479cb73df75e32008aa6f8a65579e9906fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 16:11:55 +00:00
TreeHugger Robot
82736a7d86 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f am: 510d653b7f -s ours
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be4c is already in history

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

Change-Id: Id346fa53a9bf4840483f233516e265dbf552ce54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 16:06:49 +00:00
TreeHugger Robot
966de44fd9 Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev am: 6014caf440
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458446

Change-Id: I8e50b809f73f0f4913672f87f797d9fb4700be99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 15:13:11 +00:00
TreeHugger Robot
510d653b7f Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f002f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21458445

Change-Id: I743f719b6d2561c2f1badd44b36ed623c0206a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 15:12:16 +00:00
TreeHugger Robot
6014caf440 Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev 2023-02-17 14:47:37 +00:00
TreeHugger Robot
67b00f002f Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev 2023-02-17 14:38:14 +00:00
TreeHugger Robot
5b2a3a2d8d [automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346 am: 0204d085b7 -s ours am: 6c26d070af -s ours am: 89602b292c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id91a2805a3a2b97dd6db4a8252357eae8e0e6c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 13:48:09 +00:00
menghanli
5da5dfccb8 [automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402 am: 46ce9ae5ac -s ours am: 89d198b513 -s ours am: a91833f108 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd00c5e3ba0720c119e912fe70e7a4ebfd5fa3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 13:48:06 +00:00
TreeHugger Robot
89602b292c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346 am: 0204d085b7 -s ours am: 6c26d070af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4470c7c0e9fd1f785f05a11fa208a5e04ba845a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 12:40:06 +00:00
menghanli
a91833f108 [automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402 am: 46ce9ae5ac -s ours am: 89d198b513 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3188bc57d8de4f166ff7145967df11e3294e72e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 12:40:02 +00:00
TreeHugger Robot
43870f385d [automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346 am: 0204d085b7 -s ours am: 6c26d070af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icf28366a363423de6c0ed391c667be3679481e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 12:37:31 +00:00
menghanli
2916f6793d [automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402 am: 46ce9ae5ac -s ours am: 89d198b513 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27d856ae70110c3a170b369f5ee97fc189b59ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 12:37:25 +00:00
TreeHugger Robot
6c26d070af [automerger skipped] Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346 am: 0204d085b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27e0cc692d750d74512cde54366c1daa949c32f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 11:10:37 +00:00
menghanli
89d198b513 [automerger skipped] RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402 am: 46ce9ae5ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I317e4c1413ad0acec55b06520a23e1a21d8889ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 11:10:35 +00:00
Bonian Chen
9380ce71c6 Merge "[Settings] Re-enable previous work on data saver" 2023-02-17 10:37:05 +00:00
TreeHugger Robot
0204d085b7 Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev am: 1692714346
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270

Change-Id: I863c2cdc26bfba89b9404ddad19a30e8a53cdfc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 10:14:01 +00:00
menghanli
46ce9ae5ac RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources am: 3fba0ee402
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21422270

Change-Id: I291a61602816049647592c17588771ece1cfcc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17 10:13:55 +00:00
TreeHugger Robot
1692714346 Merge "RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources" into tm-qpr-dev 2023-02-17 09:02:46 +00:00
Bonian Chen
2115d0e495 [Settings] Re-enable previous work on data saver
Previous work on data saver performance got disabled, this is a change to re-enable it.

Bug: 249502488
Test: build pass

Change-Id: I7264b1e8c21a789db358e0aae70a2cf0ce09ebba
2023-02-17 06:21:38 +00:00
Edgar Wang
78b6a400af Move tablet resources to product overlay folder
Bug: 243906265
Bug: 243888869
Bug: 243888344
Bug: 243889662
Bug: 244271773
Test: rebuild & visual
Change-Id: Ia587aa3162036c5b9797cfe38d20aa396071632e
2023-02-17 05:25:36 +00:00
Florian Mayer
36dd04b1be Fix string annotations.
The char limit was applied to the wrong string.

Change-Id: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
2023-02-16 22:49:35 +00:00
Carbo Kuo
107d7fc5c6 Migrate the About page in Settings.
This change adds the "About" page and the "Device name" Preference.

However, due to the lack of editable text support in the alert dialog (SPA widget), the device name can't be changed at the moment.

Bug: 269486170
Test: manual, see screenshots.
Change-Id: Ie6b034d82b1718c8f22366ef525fd6d36e4df9ad
2023-02-16 18:14:36 +00:00
Behnam Heydarshahi
dce497f72f Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fbdf am: d65e087b0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21164988

Change-Id: I560670cee8bd07312766d494c4a66ef770e121cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 15:47:36 +00:00
Behnam Heydarshahi
d65e087b0d Merge "Muting ring volume slider disables notification" into tm-qpr-dev am: 40a293fbdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21164988

Change-Id: I8043d9156b1602379a6580cffb29c5addf32d8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 15:01:11 +00:00
Behnam Heydarshahi
40a293fbdf Merge "Muting ring volume slider disables notification" into tm-qpr-dev 2023-02-16 14:20:07 +00:00
Treehugger Robot
d916ab4f9d Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5 am: 8f77a3bfb4 am: 0c7896c4c8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412

Change-Id: I5279778342e12651220a33497e0c8dfce1b09704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 12:26:49 +00:00
Treehugger Robot
0c7896c4c8 Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5 am: 8f77a3bfb4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412

Change-Id: I37d172d2e6aa6f988a891fa2e26112baa332e033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 11:30:45 +00:00
TreeHugger Robot
f67ff73931 Merge "[Settings] Set callback as default" 2023-02-16 11:08:32 +00:00
Treehugger Robot
8f77a3bfb4 Merge "Make Media Vibration setting configurable" am: dcb1dbc7f5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2432412

Change-Id: I1b9b9ff95026831fec9329ccfefeb6096e984389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 10:46:42 +00:00
Treehugger Robot
dcb1dbc7f5 Merge "Make Media Vibration setting configurable" 2023-02-16 09:56:25 +00:00
Brian Lee
a56e6c8768 Merge "Support remote device credentials validation in UI." 2023-02-16 09:42:40 +00:00
TreeHugger Robot
e45f1af4ea Merge "Fix textview overlap after font size modify to maximum" 2023-02-16 08:50:01 +00:00
David Magno
4e816be889 Make Media Vibration setting configurable
Add a configuration boolean to control whether or not to display
Media Vibration switch (default: display the switch).
This configuration can then be overriden by OEMs for devices
that don't support media vibration.

Bug: 268657239
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
        "com.android.settings.accessibility.MediaVibration"
Change-Id: I91857fbb04abc97b290559895010c3cbeef7ebab
2023-02-16 09:49:01 +01:00
Betty Chang
4afd4c639c Merge "To center the text of the header title" 2023-02-16 07:24:16 +00:00
Brian Lee
d4f8e5802e Support remote device credentials validation in UI.
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 258505917

Change-Id: Ifb9f15728eb8396b34c844d28f71a8e6e1aad837
2023-02-15 23:23:17 -08:00
Zoey Chen
93185b6ce0 [Settings] Set callback as default
Bug: N/A
Change-Id: Iff8ef64558db63856a9982ae0d26427f8be7b60c
Test: manual
2023-02-16 07:00:04 +00:00
menghanli
3fba0ee402 RESTRICT AUTOMERGE Fix certain Accessibility Settings subpages use wrong resources
Root cause: Portrait mode does not always respect the sw600dp qualifier and instead uses the phone (default) resources.
Solution: Using the product to customize the tablet and phone cases is better way than using the configuration qualifier.

Bug: 269130587
Test: Manual testing
Change-Id: I90cc44f1e9bccf8950a4d89f70119ba5e3c0bfdc
(cherry-pick of commit bea25c7513)
2023-02-16 05:59:01 +00:00