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
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
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
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
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
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
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
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
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
Betty Chang
9cb6a08d16
Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20802849
Change-Id: Iaf38ffd1366880869dfb9bbda3e9e57aea337b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 07:57:39 +00:00
Betty Chang
cfc1569f12
Merge "Change the intent flag to immutable" into tm-qpr-dev
2023-01-07 07:23:02 +00:00
Yanting Yang
2ab25b8b96
Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev am: f43feb6a46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871682
Change-Id: I884e3ce1ba968181da190fbf2ec1196f4894c4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 02:32:19 +00:00
Yanting Yang
f43feb6a46
Merge "Add DISALLOW_APPS_CONTROL check into uninstall app for all users" into tm-qpr-dev
2023-01-07 01:56:05 +00:00
Becca Hughes
da53b2912c
Merge "Add credential manager team to OWNERS" am: ce5d029670 am: 5b7dc67d64
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2361251
Change-Id: I0f6b895cf2ac1a2294eafdad6f15c825bb4ead5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-06 20:28:41 +00:00
Becca Hughes
ce5d029670
Merge "Add credential manager team to OWNERS"
2023-01-06 20:03:13 +00:00
Bill Yi
1883efae0a
Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
...
Merged-In: I11c236f3901c9faaeb6c702678d330dde8f07f38
Merged-In: I3d784788884f9b80733786dc73d9bb62ffef817b
Change-Id: Iabf5075f225933cd03d2d2ac43b9821ecc9fb7c1
2023-01-06 15:26:15 +00:00
Grace Cheng
305fbd98db
Merge "Updates sfps animations for natural orientation" into tm-qpr-dev am: 28d0e72a6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20860930
Change-Id: Id161cb7489bc786288adf6fb578c0ed525264202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 20:32:17 +00:00
William Escande
1da99510b1
Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 am: ce2edfa3d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748
Change-Id: I3346dba2aa9751bc77c17287dfe5d31759c05607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-05 07:02:43 +00:00
William Escande
9aa06f28e8
Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass"
2023-01-05 05:59:38 +00:00
Becca Hughes
71c948ce7b
Add credential manager team to OWNERS
...
Adds Credential Manager team to owners
for where our settings UI lives (see
internal CL).
Change-Id: I0674b170c9b96e7e7dedbb5be63fa3929f292274
Test: presubmit
Bug: 253157366
2023-01-04 17:24:35 +00:00
Yanting Yang
f3b323e378
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 16:15:16 +00:00
Treehugger Robot
2fa3b95342
Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 am: aa723a43dd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748
Change-Id: I7248e9b4f45a82ecaf55a451817dc5e056ba6c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 11:53:04 +00:00
Shen Lin
85067c8136
Fix comment typo in BluetoothLengthDeviceNameFilter
...
Change-Id: I222d048e683bff4473849d26de50318b51a1eb9e
Test: manual
2023-01-04 08:46:12 +00:00
Grace Cheng
8ada95641a
Updates sfps animations for natural orientation
...
Updates enroll find sensor animations given sfps natural orientation switch from landscape to portrait
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollFindSensorTest
Fixes: 264274708
Change-Id: I392767d2bde98e3509eef29f3095b2dafee16a30
2023-01-04 00:00:45 +00:00
Yasin Kilicdere
541a984ce0
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 23:03:32 +00:00
Yasin Kilicdere
85379e9452
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I6474b049eea96fa6b51692a71ea7a2433cdfb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 13:25:59 +00:00
Yasin Kilicdere
2ecf96a422
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I2c91cb0334d6151759f925ea84286c9af619f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 12:53:48 +00:00
Yasin Kilicdere
15a89a60ac
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev
2023-01-03 12:18:58 +00:00
Shen Lin
bdcfaceeb2
Fix NPE in BluetoothPairingController when comparing BluetoothClass
...
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
2023-01-03 06:33:51 +00:00
Ale Nijamkin
3802fbf7a2
Merge "Renames customization content provider (2/7)." into tm-qpr-dev am: 53b342a81a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20824496
Change-Id: I165e83754f1d6cfe7cf144c12ed5ac902dc01e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-28 18:37:37 +00:00
Ale Nijamkin
53b342a81a
Merge "Renames customization content provider (2/7)." into tm-qpr-dev
2022-12-28 17:42:20 +00:00
Alejandro Nijamkin
2f61fd67d1
Renames customization content provider (2/7).
...
KeyguardQuickAffordanceProvider has started to be used for more than
just lock screen shortcuts. This collection of CLs updates its name,
authority, and table schema to become more generically about "system UI
customization".
Fix: 262879277
Test: manually verified Settings > Display > Lock screen shows the
"shortcuts" item
Test: manually verified that the Wallpaper picker properly renders the
preview and can change the quick affordances
Test: manually verified that system UI displays the right lock screen
shortcuts
Change-Id: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
Merged-In: Idc0765a8c3fe50c82689d2ca7f9d19b41a62baf2
2022-12-26 17:07:03 +00:00
Zoey Chen
d6bf9262b5
[Settings] get wrong toggle when handle the WFC changed am: aee115ee3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20806352
Change-Id: Icf924f45689bfa0906661be1bfee032520cafab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-23 05:11:39 +00:00
Zoey Chen
aee115ee3b
[Settings] get wrong toggle when handle the WFC changed
...
WFC toggle's state(EXTRA_TOGGLE_STATE) is set to the newValue after each notifyChange.
However, WFC slice gets the same newValue from EXTRA_TOGGLE_STATE when users change the toggle state
before the EXTRA_TOGGLE_STATE is updated.
Need to get the "correct" new value to set the WFC
Follow the original logic(ag/3820815), 1. don't turn on WFC and only can turn off WFC if activationApp is not null. 2. turn on/off if no activationApp.
Bug: 261922170
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I823f00029c24f1901f40757ba13e7c0f90d6c0bc
2022-12-22 11:13:54 +00:00
changbetty
09a6899fc2
Change the intent flag to immutable
...
Bug: 256590210
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I68132f863027fab19351b4fdbc363e5c274e3327
2022-12-21 10:16:10 +00:00
Darrell Shi
2287f6e2e9
Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115
Change-Id: I17bc2f1b210dd0262299cfe10c6c12f2c94cca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 08:23:55 +00:00
Darrell Shi
955a2f2ac3
Change screensaver ctrlr to base pref ctrlr. am: 542644e83f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682
Change-Id: Ic6f282087660ede4a0b1fd38378c0c5adc58bc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 08:23:48 +00:00
Darrell Shi
e722587923
Merge changes from topic "hub-mode-settings" into tm-qpr-dev
...
* changes:
Add top-level Communal settings.
Change screensaver ctrlr to base pref ctrlr.
2022-12-21 08:03:49 +00:00
Darrell Shi
65836b1e3d
Add top-level Communal settings.
...
This change adds a new top-level setting, of which the availability is
controlled by a build time config value. It also registers the new
communal category so that prebuilt packages can inject preferences into
it.
Bug: 261641080
Test: verified on device that communal settings show up on top level
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3
2022-12-21 04:10:56 +00:00
Daniel Norman
c01da5ab7e
Merge "Update OWNERS for A11y Settings to include myself & remove others." am: 5394ffdd9d am: 38b5b5d994
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362352
Change-Id: I38b7ae19c2b6f1807f04b4b2a294569a922b16e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-20 19:32:38 +00:00