Commit Graph

6590 Commits

Author SHA1 Message Date
Songchun Fan
f1423369fb Merge "Remove @GuardedBy on a final, immutable field" into sc-dev am: 9dba9a6782
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467996

Change-Id: If9d37e179ef9d2cb3ac9ed600e09bbfc6020d550
2021-05-07 17:20:54 +00:00
Neil Fuller
0541a04273 Remove @GuardedBy on a final, immutable field
Remove @GuardedBy on a final, immutable field as it is causing
errorprone warnings on a work-in-progress commit.

ContentProviderHolder.mUri is accessed in multiple places without
holding mLock, and it is final and documented as immutable so should be
safe to access without mLock. This commit should reduce ErrorProne
warnings now and in future.

Bug: 185786624
Test: build / treehugger only
Change-Id: Ic7fbe550ff6f538f336cfb859f66daa94844ca28
2021-05-07 10:56:01 +01:00
Bowgo Tsai
dbec8c1a96 Merge "Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..."" into sc-dev am: d5b4a59bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341152

Change-Id: Ic69acb91e2c97373ce6314c10186c4984384d75d
2021-04-29 09:30:55 +00:00
Bowgo Tsai
d5b4a59bc0 Merge "Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..."" into sc-dev 2021-04-29 09:29:50 +00:00
Bowgo Tsai
42c0359ff4 Revert "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFA..."
Revert "Add an exception for Settings.Secure.NFC_PAYMENT_DEFAULT..."

Revert submission 14326766-b/174151290

Reason for revert: potential test error for b/186717555
Reverted Changes:
I97fcd5550:[SettingsProvider] Remove @Readable for NFC_PAYMEN...
I6e55bef75:Add an exception for Settings.Secure.NFC_PAYMENT_D...

Bug: 186717555
Bug: 182283321
Bug: 174151290
Change-Id: Ib84c57b855ffe10870fda2568a7499746f0d2335
2021-04-29 07:44:33 +00:00
Bill Lin
eb4eb29fba Merge "1/ Add ONE_HANDED_MODE_ACTIVATED secure settings for shortcut" into sc-dev am: 9df0e2bdb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14295085

Change-Id: I5b5a262b31691d3ed970562b17234c6947a52e73
2021-04-29 04:56:06 +00:00
Bill Lin
9df0e2bdb3 Merge "1/ Add ONE_HANDED_MODE_ACTIVATED secure settings for shortcut" into sc-dev 2021-04-29 04:49:42 +00:00
George Chang
3688bb0b32 Merge "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFAULT_COMPONENT" into sc-dev am: 469c7c8343
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14326766

Change-Id: Id5039abcc0173277589ba33a0d9b3526561b9d87
2021-04-29 00:16:02 +00:00
George Chang
469c7c8343 Merge "[SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFAULT_COMPONENT" into sc-dev 2021-04-29 00:13:08 +00:00
George Chang
8347fb86d4 [SettingsProvider] Remove @Readable for NFC_PAYMENT_DEFAULT_COMPONENT
Bug: 182283321
Bug: 174151290
Test: atest CtsNfcTestCases
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.nfc
Change-Id: I97fcd555072740cb3c0d80c9bb38edab5087195c
2021-04-28 12:35:12 +00:00
Bill Lin
6b7167d88a 1/ Add ONE_HANDED_MODE_ACTIVATED secure settings for shortcut
A new requirement to add A11y shortcut for One Handed Mode feature

- The shortcut action is enter or exit one handed mode
- ONE_HANDED_MODE_ACTIVATED = 0 /* false */ : STATE_NONE
- ONE_HANDED_MODE_ACTIVATED = 1 /* true */  : STATE_ACTIVE

Compare to enabled or disabled (ONE_HANDED_MODE_ENABLED)
- ONE_HANDED_MODE_ENABLED = 0 /* false */ : Disable function
- ONE_HANDED_MODE_ENABLED = 1 /* true */  : Enabled function

Test: manual
Test: make
Bug: 182425480
Change-Id: Iee911631a6734af7eb742e1206d2b9b75b694969
2021-04-28 00:44:45 +00:00
TreeHugger Robot
6fb8a98958 Merge "[SettingsProvider] hide ALWAYS_ON_VPN_APP" into sc-dev am: cbfb5f4584
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14312825

Change-Id: I7b38121956f0cce3e79721a2fa338fdcde0d19b4
2021-04-27 16:12:47 +00:00
Songchun Fan
768b0f8b7a [SettingsProvider] hide ALWAYS_ON_VPN_APP
BUG: 177239818
Test: builds
Change-Id: I4ccbf8b567ea3a6ab2cfd3001a9781a4ba821416
2021-04-26 20:50:36 +00:00
Galia Peycheva
a98d434428 Merge "Use global setting instead of forceWindowBlurDisabled" into sc-dev am: 57ef720249
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14211749

Change-Id: Id25c5ce0b06c7356959f016877e80f16a05619e0
2021-04-26 11:52:34 +00:00
Galia Peycheva
57ef720249 Merge "Use global setting instead of forceWindowBlurDisabled" into sc-dev 2021-04-26 11:42:49 +00:00
Galia Peycheva
85bb3e4da0 Use global setting instead of forceWindowBlurDisabled
This CL removes the existing TestApi
WindowManager#setForceCrossWindowBlurDisabled and replaces it
with Settings.Global#ENABLE_WINDOW_BLURS.

Bug: 14186649
Test: m && atest BlurTests
Change-Id: Ia15b7932ea973a9ed195c507558cdc71f194b366
2021-04-23 11:13:43 +02:00
Haiping Yang
d1069b628b Merge "Revert "Add global settings keys for sysui package and main activity"" 2021-04-22 21:10:31 +00:00
Haiping Yang
dd5fc3b13e Revert "Add global settings keys for sysui package and main activity"
This reverts commit 85eda008b8.

Bug:185951726

Reason for revert: <it might have caused P0 https://b.corp.google.com/issues/185951726>

Change-Id: I420d55f59d92a97dba1b6c776103777c6ad9ed0e
2021-04-22 21:09:30 +00:00
Neil Fuller
7132352de6 Merge "Update settings for Date / Time / Zone" into sc-dev am: e1aaa7f9d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14250527

Change-Id: Ifbd97f4f9dc9f26b23f9ec036e9c2493fd35be99
2021-04-22 09:51:01 +00:00
Neil Fuller
e1aaa7f9d1 Merge "Update settings for Date / Time / Zone" into sc-dev 2021-04-22 09:31:08 +00:00
Neil Fuller
423dc732e1 Merge "Remove Settings.System.DATE_FORMAT" into sc-dev am: f41708d93d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14253105

Change-Id: Ic014d82249a9b0dd4b928339996c9556d65b5bef
2021-04-21 20:22:37 +00:00
Neil Fuller
f41708d93d Merge "Remove Settings.System.DATE_FORMAT" into sc-dev 2021-04-21 20:09:40 +00:00
Matt Pietal
595a8c961b Merge "Remove "Device Controls" from Settings" into sc-dev am: a2be0990e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14215229

Change-Id: Ie985288ad394870b74ea63d2a9a85ea9355b2fb7
2021-04-21 11:38:20 +00:00
Matt Pietal
a2be0990e2 Merge "Remove "Device Controls" from Settings" into sc-dev 2021-04-21 11:31:33 +00:00
Haiping Yang
489942ac60 Merge "Add global settings keys for sysui package and main activity" 2021-04-20 23:11:03 +00:00
Mady Mellor
43b55b514b Merge changes from topic "global_to_secure" into sc-dev am: 681f269d78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14108446

Change-Id: I7f98ffc17ad3b1bb32ce11420d370e40315f0e81
2021-04-20 23:09:55 +00:00
Neil Fuller
8b8d4f8684 Remove Settings.System.DATE_FORMAT
Remove references to Settings.System.DATE_FORMAT and mark it as clearly
deprecated.

It was probably made obsolete some time before kitkat. There were still
some references in view code up to lollipop (removed in change
Ib77a8e7727d027cae39d5e6f431cac1d1ff8a121). During marshmallow / nougat
there were no references, then references were added in backup code in
oreo. This change is intended to make it more obvious that this setting
is obsolete.

Bug: 185884644
Test: build only
Change-Id: I12441541bc3ca0e012cee64d4c784a0ce8233715
2021-04-20 20:22:41 +01:00
Neil Fuller
dfa685c683 Update settings for Date / Time / Zone
Update SettingsProtoDumpUtil / secure.proto to reference the new (user
scoped) location_time_zone_detection_enabled setting that has been added
for S.  This has been added in a "DateTime" message to reflect the
SettingsUI structure.

For consistency with secure.proto and the settings strings, global.proto
and the associated SettingsProtoDumpUtil code has updated to rename the
"Auto.time" and "Auto.time_zone" proto fields to "DateTime.auto_time"
and "DateTime.auto_time_zone". This is a binary compatible change as
the field IDs have not been changed.

Note: The "time_12_24" and "date_format" settings, which are user-scoped
settings from "Settings.System" have been left for a future release
besides some minor docs improvements. See bug 185884644.

This change also improve the docs for settings that are associated with
date and time.

Bug: 151304765
Bug: 185884644
Test: build / treehugger
Change-Id: If2daf3f530bd1add7a0a5cc3260221ea3ad8952d
2021-04-20 18:46:56 +01:00
Matt Pietal
73702413f8 Remove "Device Controls" from Settings
Both device controls and wallet have moved to new areas outside of the
power menu. In step 1, we are deprecating the device controls settings,
as the user can now fully control availability within the new Quick
Settings device controls tile.

Bug: 185597511
Test: atest ControlsControllerImplTest ControlsComponentTest DeviceControlsTileTest ControlsRequestDialogTest
Change-Id: Ifdbb83dfd35263d62c9fd3dc67699769f9c9f408
2021-04-20 13:53:18 +00:00
Mady Mellor
b5a783d611 Move bubble setting to secure table & support multiuser
* Move bubbles setting from the global table to the secure
  table, this should be a per-user setting
* Update step in SettingsProvider that adds the secure
  setting based on the value of the previous global, or if
  the user is managed, it checks if the owner of the managed
  user has a secure setting & uses the value from that to
  insert the new setting.
* Adds the secure setting to the "cloned to profile"
  group since it should follow the setting of the profile
  owner.
* PreferencesHelper tracks this value per-user.

Bug: 173408780
Test: atest PreferencesHelperTest NotificationManagerServiceTest BubbleExtractorTest
Change-Id: I261364890fcc54fb2791e628b41c07aeddde3974
2021-04-19 18:51:01 -07:00
Lincoln Atkinson
85eda008b8 Add global settings keys for sysui package and main activity
Test: manual
Bug: 155178776
Change-Id: I5ddb50238eacd485ef3cc39631a1a6a9f97217bf
(cherry picked from commit 0ae7b7e022e126cc510bb87d3c95beb7d2f65e47)
2021-04-18 20:59:04 -07:00
TreeHugger Robot
3ea6c87aae Merge "Implement mode for CEC power control of connected TV and Audio System" 2021-04-16 09:55:05 +00:00
Mill Chen
d3113c38fb Add secure setting for using biometric am: 6e5f0868c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140149

Change-Id: I593eb3e61321165b7834f485c6ffb2d173199607
2021-04-15 04:37:54 +00:00
TreeHugger Robot
801ff1c44b Merge changes from topic "biometric_settings" into sc-dev
* changes:
  Move from face-specific settings to generic biometric settings
  Add secure setting for using biometric
2021-04-15 04:12:58 +00:00
Hall Liu
444175c011 Merge "Rename storeCallComposerPictureAsUser" into sc-dev am: 4d139ff936
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14188725

Change-Id: I69036fce823cb3695374e13325a297bc0639bebb
2021-04-14 22:29:20 +00:00
Hall Liu
4d139ff936 Merge "Rename storeCallComposerPictureAsUser" into sc-dev 2021-04-14 22:02:25 +00:00
Mill Chen
6e5f0868c6 Add secure setting for using biometric
Bug: 183449119
Test: builds
Change-Id: I885cd42a46d4d0cdd6f8bb5cebaf34006bf542b8
2021-04-13 17:44:07 -07:00
Hall Liu
96d703917d Rename storeCallComposerPictureAsUser
Remove the AsUser portion of the name and the userhandle argument to
comply with api guidelines, and instead take the user from the context
that's passed in instead.

Fixes: 179727265
Test: atest CallLogTest
Change-Id: Iad614f333d7bae1baab41b3d643688338a60d4c2
2021-04-13 17:03:44 -07:00
John Li
8f2fb4ddf2 Merge "Add @SystemApi for Secure.UI_TRANSLATION_ENABLED" into sc-dev am: 235c16235a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13975113

Change-Id: I983e21ad817fe7232ab1c9f47c9057e0c83d1078
2021-04-13 16:04:41 +00:00
John Li
235c16235a Merge "Add @SystemApi for Secure.UI_TRANSLATION_ENABLED" into sc-dev 2021-04-13 15:55:15 +00:00
Nathalie Le Clair
88d4d9adab Implement mode for CEC power control of connected TV and Audio System
Added 'TV + Audio System' to the possible values and implemented the functionality.

Updated naming of some local variables that were still using the old
name 'send_standby_on_sleep'.

Test: atest com.android.server.hdmi
Bug: 174821495
Change-Id: I87e9ea4029b0a61acbf85308a59470322fda53ae
2021-04-13 10:11:16 +02:00
Daniel Sandler
e2daf647a2 Merge "Power + Volume up key chord can now be configured." into sc-dev am: f34519a523
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116607

Change-Id: I3ad9a5b7d503d790b0b039b3b2251162c60dbfa4
2021-04-13 05:39:01 +00:00
Daniel Sandler
f34519a523 Merge "Power + Volume up key chord can now be configured." into sc-dev 2021-04-13 04:56:27 +00:00
John Li
221de3457b Add @SystemApi for Secure.UI_TRANSLATION_ENABLED
Bug: 177299699
Test: manual
Change-Id: I711d078281ae9cc17ebb21e6c3f857caad31016a
2021-04-13 02:57:45 +00:00
Songchun Fan
afeca8affa Merge "[SettingsProvider] specify settings type in the comments" into sc-dev am: 1b689fe01b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14145172

Change-Id: Ied6da50dc342f485513e830f959308e608189ea2
2021-04-12 20:08:20 +00:00
Songchun Fan
1b689fe01b Merge "[SettingsProvider] specify settings type in the comments" into sc-dev 2021-04-12 19:27:26 +00:00
Chloris Kuo
fa06698519 Merge "NAS Settings Migration" into sc-dev am: cfab1005d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931022

Change-Id: I44e2ceb029c6b69aacc921c3ac69d925352c3456
2021-04-12 17:43:18 +00:00
Chloris Kuo
cfab1005d3 Merge "NAS Settings Migration" into sc-dev 2021-04-12 17:16:57 +00:00
Dan Sandler
069278cdb7 Power + Volume up key chord can now be configured.
Device default value set in config_keyChordPowerVolumeUp in
config.xml; can be overridden for all users with
Settings.Global.KEY_CHORD_POWER_VOLUME_UP.

Value may be one of:

    0 - no-op
    1 - vibrate mode (current AOSP default behavior)
    2 - launch assistant

Bug: 179673796
Test: adb shell settings put global key_chord_volume_up <0, 1, or 2>
      adb shell dumpsys window | grep mPowerVolUpBehavior
      adb shell input keycombination POWER VOLUME_UP
Change-Id: I0e03155bdbe61d9fdd6838fe2c860749cf360907
2021-04-12 12:05:52 -04:00
TreeHugger Robot
c118bde427 Merge "Update ContactsContract.Settings javadoc" 2021-04-12 15:01:56 +00:00