packages-apps-Settings

Fork

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

Enable the filterTouchesWhenObscured in Special app access

- Enable the filterTouchesWhenObscured attribute on all toggle
switches in all pages of the special app access

Bug: 155288585
Test: make RunSettingsRoboTests
Merged-In: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
Change-Id: I85842db3faa558ea61bc878ca76ff6d8ce1a4b03
(cherry picked from commit 7359b3840f06ef75c70d75a5708011fef25a2bab)

Prevent overlay drawing on top of Bluetooth discovery request dialog

Bug: 155650356
Change-Id: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
Merged-In: I9cee6e5bb8cef77aa385d664fe0738db1496ef20
(cherry picked from commit ac671004231fb2ceb85f3101995e22dcc52c8088)

Prevent overlay drawing on top of Bluetooth pairing dialog

Bug: 155648639
Change-Id: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
Merged-In: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
(cherry picked from commit 3f5bf02fd8b72a57052fefccf90d0f42ab8ab5e0)

Allows to launch only authenticator owned activities

- 3rd party developers can define himself-authenticator
and use the accountPreferences attribute to load the
predefined preference UI.
- If a developer defines an action intent to launch the
other activity in xml and it would return true due
to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f988449617d757a5d7439314198d10d6ee78)
(cherry picked from commit 4b6e82fd5d2204cd37eae0d7c7b08f19b96baffe)

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

RESTRICT AUTOMERGE
Allow LockScreenPattern to be launched in the pinning screen

If work profile lock is enabled and work app is pinned, users will get a
black/white screen on the phone. That's because Settings is prevented
from other apps launch any pages of Settings in the pinning mode.

In order to launch some pages of Settings from other apps, we add a
condition to the preventive mechanism and allow the activity inherited
from SettingsBaseActivity to override the condition to have the activity
to be launched from other apps in the pinning mode.

Bug: 137015265
Bug: 135604684
Test: manual test
Change-Id: I8070de79a83350d1658efcb19e983669dad0e673
Merged-In: I8070de79a83350d1658efcb19e983669dad0e673
(cherry picked from commit 3f4d3b4ac257451ccc1676f65321dedb2cb1870e)

Prevent accounts page directly opening in screen pinning mode

In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab3546c019d4b79c502f7b8850d36123a5)
(cherry picked from commit ad2502a91a6d0814396b2d26a7270e8cbdb2ed38)

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

Conflicts:
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/SettingsActivity.java
src/com/android/settings/bluetooth/BluetoothPairingDialog.java

Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

Android 7.1.2 Release 39 (5787804)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXZfNuQAKCRDorT+BmrEO
eM2mAJ40fawiOeEppBSfzeXzDNUka9/AhgCfbnE290kriJi/UmVWS8uMPXEdNWs=
=gh0Y
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r39' into nougat-x86

Android 7.1.2 Release 39 (5787804)

Make ScreenPinningSettings behaviour consistent with lock tasks.

Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
(cherry picked from commit b985aa2f2930e30218bdd1cf1161453b7e622418)

Do not allow draw on top for App notification settings

Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
(cherry picked from commit 04208f16b02c793f52b8c04d41799f79f286b056)

Automatic translation import

Change-Id: I1f61a17b4bbc7600fc3d1a2a0bb7a32cc1518ce8

[BACKPORT]Settings: per-app VPN data restriction

*) Add option to disable all vpn data in app data usage settings.

*) VPN restriction independent from WiFi/mobile data restrictions.

Cherry-picked from https://review.lineageos.org/#/c/LineageOS/android_packages_apps_Settings/+/232793/

Change-Id: I9cb527747afa21b3dce4d61be834416a2fb9e9b4

[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.

Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
(cherry picked from commit b985aa2f2930e30218bdd1cf1161453b7e622418)

Do not allow draw on top for App notification settings

Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
(cherry picked from commit 04208f16b02c793f52b8c04d41799f79f286b056)

Do not allow draw on top for default sms picker.

Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe1b70618c5a92c3e3461a4b379db236)
(cherry picked from commit 95d0fb7f4911403844666632ece42467f60ad753)

Do not allow draw on top for default sms picker.

Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe1b70618c5a92c3e3461a4b379db236)
(cherry picked from commit 95d0fb7f4911403844666632ece42467f60ad753)

Automatic translation import

Change-Id: I883549e61ac8ea1f3846320d59620eeea0a1d362

Make adb use a custom prop for adb root

Change-Id: Ibc6b06d5e4729bd76fc26ffcd072a2ba4219c708

BACKPORT: Disable changing lock when device is not provisioned.

When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
(cherry picked from commit 770f4abf9de2bb7d74497cc4b5f6795023229ef2)
CVE-2018-9501

Automatic translation import

Change-Id: I0f13a7ad827e30b8b769fae67a23d3cfbd3e5aa0

DO NOT MERGE Disable changing lock when device is not provisioned.

When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
(cherry picked from commit 94ea2dad5b936381d8ea0195ea7e63df956c0aed)

Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
(cherry picked from commit 732b65ca4de0bf9cedeb3f2369a2ca596e78cfd3)

DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name

Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c
(cherry picked from commit 4f58c19afa6531fbc56222775dc776f8b976881c)

Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
(cherry picked from commit 732b65ca4de0bf9cedeb3f2369a2ca596e78cfd3)

DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name

Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c
(cherry picked from commit 4f58c19afa6531fbc56222775dc776f8b976881c)

Title is different after tapping "Memory used by apps"

“App usage” is displayed as title after tapping
“Memory used by apps” on “Memory” screen. Change the
title from “App usage” to “Memory used by apps” for
consistency.

Change-Id: I3bada43f1fea1ae9acabb151ac68b60900a26dda

settings: wifi: Default to numeric keyboard for static IP items

CYAN-7646

Change-Id: Ibc02cdcc863d2ae373b24bcfd5b97bf63de99222