PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,503 Commits 1 Branch 0 Tags
0797feaf7b5788b9521c6b9ffd41e360b258bdfb
Commit Graph

111503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Treehugger Robot
a0642974a4 Merge "Change API name" 2023-02-22 16:59:10 +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
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
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
Treehugger Robot
3272025234 Merge "Add mtv engineers to owners for emergency code reviews" 2023-01-27 19:21:59 +00:00
Yang Lu
b9862e79df Add mtv engineers to owners for emergency code reviews 
Change-Id: I440120397c11b8ebce617649c700b63dbca30ee8
Test: N/A
 2023-01-27 05:21:25 +00:00
Treehugger Robot
1d7192e9f6 Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034

Change-Id: I4f2e99ebcb887b0203fcb7bb915968b4acd11f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 02:15:02 +00:00
Treehugger Robot
5f27701d95 Merge "Fix NullPointerException when renaming a fingerprint" 2023-01-25 01:39:07 +00:00
Ilya Matyukhin
67d47f6b4a Fix NullPointerException when renaming a fingerprint 
(Original change made by xingbin.feng@sony.com)

Fix NullPointerException when rotating the screen while renaming
a registered fingerprint

Bug: 236873593
Test: Click a registered fingerprint to open the Rename dialog,
rotate the device and press OK. Verify that Settings does not
crash

Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b
 2023-01-24 23:55:29 +00:00
Treehugger Robot
3e1e67aa9c Merge "Update OWNER list" am: f846e5cf0e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2396592

Change-Id: I2d2cc997c8a01a42d4147029fe71e706a05b3daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-20 07:35:43 +00:00
Treehugger Robot
f846e5cf0e Merge "Update OWNER list" 2023-01-20 06:53:33 +00:00
Yanting Yang
5c959d8610 Update OWNER list 
Test: N/A
Change-Id: Ibb67601aa44b690fd4ac3016329277f8cb89be64
Merged-In: I9ab91f21558513b85847d9c513e7d50f9486c6ea
 2023-01-20 05:06:37 +00:00
Daniel Norman
f86a0718b0 Fixes resource file exemption. 
The previous version missed out on other file types (JSON motion files, mp4, etc.)

Change-Id: I2d1846ff1ab2461fe0c3716b02d1a323cb8af85b
 2023-01-19 19:37:01 +00:00
Betty Chang
c985a6d47d Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039

Change-Id: I92615d5cc7a8605458d78082b45b339234ea52e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-13 11:58:35 +00:00
Betty Chang
d7e16c22f6 Merge "[LE Audio] To add the vibrate when the scan is successful" 2023-01-13 10:34:12 +00:00
Android Build Coastguard Worker
d382eee7e9 Merge cherrypicks of ['ag/20919289'] into tm-qpr2-release. 
Change-Id: I93213ba09a855945301556ad149220d360ff8f29
 2023-01-13 03:02:28 +00:00
Diya Bera
5b9653f581 Fixes background color in SUW fingerprint enrollment 
Test: Manual (Enroll fingerprint in SUW, background color remains the
same)
Bug: 246231650
Bug: 250464527

Change-Id: Iffd1543d8b230199c3b925c6538bd418a381c96a
(cherry picked from commit 00dfcd83dc)
Merged-In: Iffd1543d8b230199c3b925c6538bd418a381c96a
 2023-01-13 02:59:44 +00:00
changbetty
ca475a5d37 [LE Audio] To add the vibrate when the scan is successful 
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
 2023-01-13 02:30:23 +00:00
Xin Li
5482fb0301 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
 2023-01-11 22:47:24 -08:00
Treehugger Robot
9c8ff84746 Merge "Amend "Reset notification importance" list item style" am: aef592eb18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194

Change-Id: Ife8b88093010ff9fea43758057d334bbea50540a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 11:19:53 +00:00
Treehugger Robot
aef592eb18 Merge "Amend "Reset notification importance" list item style" 2023-01-11 10:31:55 +00:00
Shen Lin
1721d0f276 Amend "Reset notification importance" list item style 
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.

Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
 2023-01-11 05:21:59 +00:00
Android Build Coastguard Worker
6d0bd58e7f Snap for 9465878 from 30783964b3 to tm-qpr2-release 
Change-Id: I1e8465e635a753efadc8e991c726923f8e9522e3
 2023-01-07 22:30:13 +00:00
Betty Chang
f0b70510d8 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832 am: ddeff2f67f -s ours am: 30783964b3 -s ours 
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2 is already in history

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

Change-Id: I292f88e40c9e6228dd6395fa6f6be4cf896ce4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-07 09:09:10 +00:00