PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,523 Commits 1 Branch 0 Tags
1325de7875b34d6ec8056d3c15c20afcc294c927
Commit Graph

111523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henri Chataing
1325de7875 Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247

Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 23:02:43 +00:00
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
Charles Chen
159b42a247 Make Settings show in two-pane on portrait tablet 
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
 2023-02-23 08:38:52 +00:00
Anvesh Renikindi
3b08c0d9db Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442919

Change-Id: Iff9e2012e64c7776ccfeba98b69afca280ef13b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:18 +00:00
Anvesh Renikindi
928a3c22a6 [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I57bf736b9fdc9cf9100139a65c0df5d5fd88f7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:13 +00:00
Jiaming Liu
47c2b78f94 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I6ab1de1556098dc77963331f2f0c2dc14c7aef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:11 +00:00
William Escande
57f3e9428f Merge "Snoop Logger: fix descriptions" am: 5fd265405c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:21:57 +00:00
Anvesh Renikindi
60763d6941 Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" 2023-02-23 06:22:15 +00:00
Anvesh Renikindi
a54ecedde3 Merge changes from topic "androidx_ae" 
* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.
 2023-02-23 06:22:15 +00:00
William Escande
5fd265405c Merge "Snoop Logger: fix descriptions" 2023-02-23 05:58:19 +00:00
Henri Chataing
b2e4e3c85f Nfc: Rename system properties in Nfc settings 
The nfc properties are now added to system/libsysprop and
were renamed at the same time for homogenity.

Bug: 268219397
Test: m Settings
Change-Id: I496e128b9db225aac583a1e0b91687f78a268b63
(cherry picked from commit 94e898a02b)
 2023-02-23 01:48:42 +00:00
Henri Chataing
4886f28aba Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I082c6fda1b1420dd49a2507ea87e8262b341be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:31:00 +00:00
Jack Yu
e1dfe3d417 Show reboot dialog when users disable developer options am: d91e7a0565 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: If1a8b237f58bcbb1c07a27b054be09a7530922f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:54 +00:00
Jack Yu
0797feaf7b Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:37 +00:00
Treehugger Robot
f9d1535640 Merge "Change API name" am: a0642974a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I3a96da519c41151b57e7580b0816101590322b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:21:01 +00:00
Henri Chataing
4de9ff1a8f Merge changes from topic "nfc_logging_control" 
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
 2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4 Merge "Change API name" 2023-02-22 16:59:10 +00:00
Jakub Rotkiewicz
c0a7e8f8f0 Snoop Logger: fix descriptions 
Test: refactoring CL. Existing unit tests still pass
Merged-In: Ie6a6b27247896e2a9a410197135e44a22ab1428c
Change-Id: Ie6a6b27247896e2a9a410197135e44a22ab1428c
 2023-02-20 15:12:31 +00:00
Hieu Dang
8115b87ea3 Change API name 
Change getCreateBondCaller to getPackageNameOfBondingApplication

Bug: 269604212
Test: atest BluetoothDeviceTest
Tag: #refactor
Change-Id: Ib596f94a6a718069ca9fb3a1c572ee3583f7504b
 2023-02-19 15:11:42 +00:00
Jiaming Liu
da7f685695 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)
(cherry picked from commit 1c0af48f8c)
 2023-02-18 17:01:11 +00:00
Diego Vela
585a7f3c7a Update ActivityEmbedding usage. 
Bug: 259592300
Test: build.
Change-Id: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
Merged-In: I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571
(cherry picked from commit a9394d1796)
(cherry picked from commit 65bb5a09f4)
(cherry picked from commit d2dfc4285e)
 2023-02-18 16:27:45 +00:00
Jack Yu
733b317406 Add test cases for NfcSnoopLog and NfcVerboseVendorLog 
Bug: 204397062
Test: make RunSettingsRoboTests
Merged-In: Id12e3c10dc04816d4a69692b2d922840a8e84c61
Change-Id: Id12e3c10dc04816d4a69692b2d922840a8e84c61
(cherry picked from commit bcf2efe31e)
 2023-02-17 17:29:56 +00:00
Jack Yu
d91e7a0565 Show reboot dialog when users disable developer options 
When NFC detailed logging mechanisms are enabled and users try to
disable develoepr options, show reboot request dialog to make sure
NFC logging mechanisms are also disabled.

Bug: 204397062
Test: manual
Merged-In: I531c85fd77934ad7821c480df07465a8cd8f24f9
Change-Id: I531c85fd77934ad7821c480df07465a8cd8f24f9
(cherry picked from commit d270f29cc8)
 2023-02-17 17:29:15 +00:00
Jack Yu
8f1794043c Add a new NFC developer setting option for NFC vendor verbose log 
Add a new developer setting option to enable vendor verbose log.

Bug: 204397062
Test: manual
Merged-In: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
Change-Id: Ic837bbcc32979c44732e99d51e4dcf93eb201cf1
(cherry picked from commit 3d2aff896e)
 2023-02-17 17:28:36 +00:00
Jack Yu
a2f8944942 Add a new NFC developer setting option for NFCSNOOP 
Add a new developer setting option to enable full NFCSNOOP log.

Bug: 204397062
Test: manual
Merged-In: I3fd34500e5e7093c9d77ff737987a35f6866814e
Change-Id: I3fd34500e5e7093c9d77ff737987a35f6866814e
(cherry picked from commit b71de640b5)
 2023-02-17 17:27:38 +00:00
Jiaming Liu
b9f82bed98 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)
 2023-02-17 04:15:28 +00:00
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
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
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
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
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
My Name
2e552331e9 Show Bluetooth dialog in a specific case 
If the application that initiate the bonding with
BluetoothDevice#createBond is in foreground, then should dialog only
instead of showing the notification & dialog

Bug: 175931562
Tag: #refactor
Test: manual
Change-Id: I3673a0b58cbf9caabf62c951b84b49e17cfb13b8
 2023-02-10 08:31:34 +00:00
Treehugger Robot
016f304b8d Merge "Merge TQ1A.230205.002" am: 0a9affaaab 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2423108

Change-Id: I4147301439d6f88a08a8fa0f3b78cb5c9dd13f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-08 18:13:26 +00:00
Treehugger Robot
0a9affaaab Merge "Merge TQ1A.230205.002" 2023-02-08 10:40:37 +00:00
Xin Li
c660135971 Merge TQ1A.230205.002 
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
 2023-02-06 21:05:31 -08:00
Patrick Rohr
ac83ccd34f Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc1833d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2420579

Change-Id: If7bf40d49a67c14a62e4db7994995dac9b86fb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-03 18:15:21 +00:00
Patrick Rohr
b0ddc1833d Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" 2023-02-03 17:28:34 +00:00
Patrick Rohr
d2d340146e Enable ethernet data usage when FEATURE_USB_HOST is present 
Ethernet is enabled when either FEATURE_ETHERNET *or* FEATURE_USB_HOST
is present. See ConnectivityService#deviceSupportsEthernet.

ConnectivityService#deviceSupportsEthernet should really be moved to
some commonly accessible location.

Test: TH
Change-Id: I497d99169248db7e5948b3a19134ab42e66d5b9b
 2023-02-03 03:32:02 +00:00
Treehugger Robot
b6050b438d Merge "Fixes resource file exemption." am: 888759dd9f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652

Change-Id: I36b5629352f9dcff89dc387e50e77d1eed083ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-30 21:36:22 +00:00
Treehugger Robot
888759dd9f Merge "Fixes resource file exemption." 2023-01-30 20:28:12 +00:00
Android Build Coastguard Worker
b420deb9b7 Merge cherrypicks of ['googleplex-android-review.googlesource.com/21091560'] into tm-qpr2-release. 
Change-Id: I3c4506dd06c6d9c185c699d63297f4fe586ab843
 2023-01-28 02:57:21 +00:00
Behnam Heydarshahi
a61c636eab DO NOT MERGE ANYWHERE 
Revert "Read flag to show/hide notification slider"

Revert submission 20180104-flag_for_b38477228

Reason for revert: b/261809910 fixing for qpr2

Reverted changes: /q/submissionid:20180104-flag_for_b38477228

Change-Id: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
(cherry picked from commit b1195633da9d203056d29df8f119820425a33254)
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
 2023-01-28 02:56:59 +00:00
Treehugger Robot
f706f0fc0f Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300

Change-Id: I50416ec05b1f205986f48fa3635190ec9f48a64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 20:25:55 +00:00