PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,342 Commits 1 Branch 0 Tags
71814b355c6ab63d6e96d1b5af6b2edd14d4867c
Commit Graph

112342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Vela
42004f3b6b Update ActivityEmbedding usage. 
Update ActivityEmbedding usage.

Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
 2023-02-17 12:04:26 +08:00
Arc Wang
dd97d9cc71 Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property 
Future WM Jetpack library updates will ask for the property to
enable ActivityEmbedding feature.

Bug: 264733035
Test: build pass
Change-Id: I0f5e5a10250049fb9425eac7c113b803b6701cc7
Merged-In: I0f5e5a10250049fb9425eac7c113b803b6701cc7
 2023-02-17 11:25:23 +08:00
Darrell Shi
86113ae01f Hide "additional info" when active dream does not support. 
Only show the "additional info", which displays dream complications,
when supported by the user selected dream.

Test: make -j86 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"
Test: verified on device switching between different dreams
Bug: 223860510
Fix: 223860510

Change-Id: I63872ea9ab9f42be47f8e2f7c3835b55056e6588
 2023-02-17 00:40:02 +00:00
Android Build Coastguard Worker
0589396721 Snap for 9618620 from 40a293fbdf to tm-qpr3-release 
Change-Id: If40d5b126b1a25bab9a0f04ff7d2fc10ff55c1a0
 2023-02-17 00:28:44 +00:00
Steve Elliott
131598bc14 Update unseen notif filtering settings string 
Bug: 267963644
Test: verify string changed in Settings > Notifications
Change-Id: Icc6db108d84eeb56192318a7ddba6505eaf1d262
 2023-02-16 16:47:55 +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
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
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
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
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
Charles Chen
1881749f09 Make Settings show in two-pane on portrait tablet 
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
(cherry picked from commit cf3199fc9e)
 2023-02-16 05:32:44 +00:00
Arc Wang
bfc95e7ba1 Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property 
Future WM Jetpack library updates will ask for the property to
enable ActivityEmbedding feature.

Bug: 264733035
Test: build pass
Change-Id: I0f5e5a10250049fb9425eac7c113b803b6701cc7
Merged-In: I0f5e5a10250049fb9425eac7c113b803b6701cc7
(cherry picked from commit cf4ee7be4c)
 2023-02-16 05:30:08 +00:00
Android Build Coastguard Worker
91535cbea0 Snap for 9613276 from 55d7faff28 to tm-qpr3-release 
Change-Id: I0c6b5c348df0ad9ab4f9e9a3c22c47a37f33f1d0
 2023-02-16 00:25:23 +00:00
Anvesh Renikindi
120964222c [automerger skipped] Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev am: 217c026095 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a is already in history

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

Change-Id: Ic8161e5dca42b0e4b4f0aef8042bee90d70747b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 23:51:01 +00:00
Jiaming Liu
1aca5ed787 [automerger skipped] Fix build for jetpack update am: 1c0af48f8c -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 5a6444776a is already in history

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

Change-Id: I3c21bab1c9a397ca7cb8b72fcc1927eec1d0f1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 23:50:49 +00:00
Anvesh Renikindi
217c026095 Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev 
* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.
 2023-02-15 23:35:17 +00:00
Xin Li
6ef4e6bed1 [automerger skipped] RESTRICT AUTOMERGE - Merge TQ2A.230305.008 am: 65d9917e8a -s ours 
am skip reason: Merged-In I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932 with SHA-1 2ac6fc5709 is already in history

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

Change-Id: Id1449689909d6e3b0c755d648a26d25af75eceff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 22:04:46 +00:00
Bill Yi
10ba09612f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 55d7faff28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad795bcbd415cefb84037dfc20bd35f88fdac11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 19:47:11 +00:00
Bill Yi
ea62a80a18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2d5a33748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I252b26abc8bab5d1c204b06b672633106f896aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 19:47:00 +00:00
Bill Yi
4274924f76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ea0587455f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I214216265b3ec12587957c5dfe948281fe44cc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 19:46:43 +00:00
Bill Yi
3cb47aa3bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e52f449fa2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e1d4ee2dcef6559a41af4ab55023ebd01b21bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 19:46:25 +00:00
Bill Yi
55d7faff28 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-15 19:21:32 +00:00
Bill Yi
ea0587455f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-15 19:21:32 +00:00
Behnam Heydarshahi
d9c3cf855f Muting ring volume slider disables notification 
With volume_separate_notification flag enbaled, muting ring volume
slice will cause notification volume slice to gray out.

There used to be a bug in which notification slice would not get
updated in response to a change in ring volume mute/unmute broadcast.
The resulting erroneous behavior was notification slider would get to
zero but not get grayed out. To fix that bug, VolumeSliceHelper listens
to ring stream mute/unmute broadcasts and forwards them to notification
slice.

Bug: b/266072907
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|VolumeSliceHelperTest" RunSettingsRoboTests -j40

Change-Id: I2ab51f1272bf99a0c3d9ca285354052d00910c90
 2023-02-15 15:43:08 +00:00
Behnam Heydarshahi
3ee4929594 Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549

Change-Id: If4cfdeb37dbcc49ce9ec36bee690df4db1a87213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 15:08:56 +00:00
Behnam Heydarshahi
d89de47399 Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev 2023-02-15 14:28:15 +00:00
menghanli
af1f8ed6ad Add a done button to vision setting pages in setup flow am: 991b70c720 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21414425

Change-Id: Ibb2f4831810685728481e6a9ba5073c3252b9968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 02:33:03 +00:00
Bill Yi
e2d5a33748 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I89a9586453eee0e88d4aca8771fb8a582e2b32b5
 2023-02-14 18:01:45 -08:00
Bill Yi
e52f449fa2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4134c3f26fd6779ddbc882bc377966c57570e245
 2023-02-14 17:55:33 -08:00
Xin Li
65d9917e8a RESTRICT AUTOMERGE - Merge TQ2A.230305.008 
Bug: 264720040
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
Merged-In: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
Change-Id: I5833464626eb06a01d6979c477be98ba06827893
 2023-02-14 16:31:37 -08:00
menghanli
991b70c720 Add a done button to vision setting pages in setup flow 
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation. This change combines parts of commit 5e931b2c23 and commit dd2ec775c8.

Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
Merged-In: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
(cherry picked from commit dd2ec775c8)
 2023-02-15 06:32:57 +08:00
Android Build Coastguard Worker
56b8de9cb1 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21052003', 'googleplex-android-review.googlesource.com/21154458'] into tm-qpr2-release. 
Change-Id: I64afa6b17b073b955daef1dd167d00562a0bfb79
 2023-02-14 18:21:11 +00:00
Jack Yu
78b42aeb37 Only primary user is allowed to control secure nfc 
Bug: 238298970
Test: manual
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313
(cherry picked from commit 0e57ff90cd)
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
 2023-02-14 18:18:19 +00:00
Josh Hou
211f81afe6 Fix the security vulnerability issue in AppLocalePickerActivity 
Examine whether the packages is allowed to display app locales list when creating the AppLocalePickerActivity, and examine whether the target user is the same as the calling user.

Bug: 257954050
Test: Follows the test step listed in b/257954050#comment14
Change-Id: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
Merged-In: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
(cherry picked from commit 5d7d1665fe)
Merged-In: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
 2023-02-14 18:18:16 +00:00
Hieu Dang
c6cbe0b6ac Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 am: 420a8474db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645

Change-Id: I09e99a75b6509f750d938090ede17c4fe3398a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-14 02:45:29 +00:00
Jiaming Liu
1c0af48f8c Fix build for jetpack update 
Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836
(cherry picked from commit e65283de6a)
(cherry picked from commit 5a6444776a)
 2023-02-14 02:04:33 +00:00
Hieu Dang
420a8474db Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645

Change-Id: I9e231ac0e16c8e8217be53cc89335758b14be6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-14 02:02:08 +00:00
Hieu Dang
e1e657dac3 Merge "Show Bluetooth dialog in a specific case" 2023-02-14 01:55:09 +00:00
Diego Vela
d2dfc4285e Update ActivityEmbedding usage. 
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
(cherry picked from commit 65bb5a09f4)
 2023-02-14 00:36:20 +00:00
Behnam Heydarshahi
236bbcb8bc Propagate mute event to both ring volume slices 
Fix a bug where introduction of a separate_ring_volume slice meant that
the original ring_volume slice would not get notified of ring stream
muting event.

Bug: b/266855922

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=VolumeSliceHelperTest RunSettingsRoboTests -j40
Change-Id: Ifb5ebe4e7d9bde3d14336891cce3fbee167a5911
 2023-02-13 14:50:27 +00:00
Jakub Rotkiewicz
2a82a4f3b1 Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91 am: bd2f353f8b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

Change-Id: I948bc2e08e3044d20a9d3ce5b081c940bea54811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-13 14:19:30 +00:00
Jakub Rotkiewicz
bd2f353f8b Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

Change-Id: I3c138106ebdaaf6b5597c6a79054915a04098117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-13 13:35:37 +00:00
Jakub Rotkiewicz
cfde422f91 Merge "SnoopLogger: Debug enhancements added settings" 2023-02-13 13:01:01 +00:00
Jakub Rotkiewicz
5a1b8a11a6 SnoopLogger: Debug enhancements added settings 
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4

Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
 2023-02-13 11:35:55 +00:00
Android Build Coastguard Worker
a427df1358 Snap for 9595574 from 3773ae0d9f to tm-qpr3-release 
Change-Id: Idadb09106a340fdab21a9459dd695d38a150b60e
 2023-02-11 22:29:56 +00:00
TreeHugger Robot
507631c4f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3773ae0d9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a6226bafb7b3ad24c25183df2c4eda9d942bfd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 20:32:55 +00:00
Bill Yi
9dcc1f9bed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bd553ab9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I818bd4e3dfaf8baa07e1d63b9df7bdc0ffc1aacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 20:32:25 +00:00
TreeHugger Robot
3773ae0d9f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-11 19:15:37 +00:00