OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoSnap for 4393674 from 85f59ff42da3336fd300a7508cc1f4fe31d8e9bf to oc-mr1-release
android-build-team Robot [Fri, 13 Oct 2017 07:21:12 +0000 (07:21 +0000)]
Snap for 4393674 from 85f59ff42da3336fd300a7508cc1f4fe31d8e9bf to oc-mr1-release

Change-Id: I8dada9b3c2ed464ada4a5633aff5a2198610fbcb

6 years agoMerge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
TreeHugger Robot [Thu, 12 Oct 2017 18:54:43 +0000 (18:54 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev

6 years agoSnap for 4391495 from 1c4d686b0c50caf025661780196e2816f871f5ec to oc-mr1-release
android-build-team Robot [Thu, 12 Oct 2017 07:25:21 +0000 (07:25 +0000)]
Snap for 4391495 from 1c4d686b0c50caf025661780196e2816f871f5ec to oc-mr1-release

Change-Id: I811e190fec4d199fdd244003f847f00db0e153fd

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 22:19:18 +0000 (22:19 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863  -s ours am: 952ae3ec34
am: 8b399b3eb7

Change-Id: I42b7d928abb3e1ae71f6e23ddceba969a821f639

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 22:17:49 +0000 (22:17 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0  -s ours am: 0f53a56cbd
am: 9138455b41

Change-Id: Iaad4be44e1410eac3b0b63d33953bf643d2b3503

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 11 Oct 2017 22:16:37 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 22:02:29 +0000 (22:02 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863  -s ours
am: 952ae3ec34

Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 22:00:24 +0000 (22:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0  -s ours
am: 0f53a56cbd

Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707e...
Jeff Sharkey [Wed, 11 Oct 2017 21:47:52 +0000 (21:47 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003  -s ours am: 47bc5fba05
am: 4d61a1bd15

Change-Id: I7f3fc44f882eed0a435e75cec95c7a03219cc67a

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee253...
Jeff Sharkey [Wed, 11 Oct 2017 21:46:44 +0000 (21:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd  -s ours am: b410435a21
am: de7c312543

Change-Id: If4193b75eaccdc612b94af027a8ce6548e613aad

6 years agoMerge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am...
Jeff Sharkey [Wed, 11 Oct 2017 21:45:11 +0000 (21:45 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064

Change-Id: I7a621bcf8afdc1a3cb80e7e57d25adf5f96a17f0

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:42:57 +0000 (21:42 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44
am: e803004863  -s ours

Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:42:14 +0000 (21:42 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb
am: 250d5e60b0  -s ours

Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:34:11 +0000 (21:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79
am: 2433b6dc44

Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:33:01 +0000 (21:33 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3
am: 3aa36a6afb

Change-Id: I8f5d74a40d179512466a3d2e77416b5222da01e7

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707e...
Jeff Sharkey [Wed, 11 Oct 2017 21:24:25 +0000 (21:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003  -s ours
am: 47bc5fba05

Change-Id: Icf6b9c17a843608befc1250a9fdcf8a10dfa8848

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:21:40 +0000 (21:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e am: 86cc9a681d
am: d721694b79

Change-Id: Ie3b5bc22af9ddbf47c6236d40a21d8bc051599be

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:20:09 +0000 (21:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3 am: b3d4bc8239
am: 53a69985b3

Change-Id: Icadeebe688c38f4e4d0b190ed07acd7d5396aef3

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707e...
Jeff Sharkey [Wed, 11 Oct 2017 21:12:41 +0000 (21:12 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda
am: efe9e7e003  -s ours

Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee253...
Jeff Sharkey [Wed, 11 Oct 2017 21:10:10 +0000 (21:10 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd  -s ours
am: b410435a21

Change-Id: I91421c6629af2131e7aaeadac048c92da9653212

6 years agoMerge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
Jeff Sharkey [Wed, 11 Oct 2017 21:09:20 +0000 (21:09 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
am: 9c39da39df

Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 21:01:29 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours am: 004f90f35e
am: 86cc9a681d

Change-Id: I30d07aff1d361734e7a962dd89d1935137ed64dd

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 21:00:27 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours am: 89791cb5c3
am: b3d4bc8239

Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707e...
Jeff Sharkey [Wed, 11 Oct 2017 20:57:51 +0000 (20:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0
am: fe1daa6eda

Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 20:46:28 +0000 (20:46 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43  -s ours
am: 004f90f35e

Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688ab...
Jeff Sharkey [Wed, 11 Oct 2017 20:45:04 +0000 (20:45 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f  -s ours
am: 89791cb5c3

Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
Jeff Sharkey [Wed, 11 Oct 2017 20:44:53 +0000 (20:44 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf
am: 979efb53d0

Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
Jeff Sharkey [Wed, 11 Oct 2017 20:39:07 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346
am: 46bc2bd7bd  -s ours

Change-Id: I55b5048ea4ecb689a7d483afeb174a153cc54fdc

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours...
Jeff Sharkey [Wed, 11 Oct 2017 20:35:37 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa  -s ours am: 70387afef9
am: 9173362f4e

Change-Id: I8eb3e136b4edb5858a681fb69c0f90d216255e55

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42...
Jeff Sharkey [Wed, 11 Oct 2017 20:35:23 +0000 (20:35 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7
am: ba66bb8a43  -s ours

Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
Jeff Sharkey [Wed, 11 Oct 2017 20:34:40 +0000 (20:34 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb
am: 45926efd0f  -s ours

Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc

6 years agoMerge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
TreeHugger Robot [Wed, 11 Oct 2017 20:32:55 +0000 (20:32 +0000)]
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
Jeff Sharkey [Wed, 11 Oct 2017 20:32:38 +0000 (20:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab
am: 95bbef26d7

Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
Jeff Sharkey [Wed, 11 Oct 2017 20:31:41 +0000 (20:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb

Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
Jeff Sharkey [Wed, 11 Oct 2017 20:29:25 +0000 (20:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
am: 7c41707eaf

Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
Jeff Sharkey [Wed, 11 Oct 2017 20:28:13 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab

Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
Jeff Sharkey [Wed, 11 Oct 2017 20:28:11 +0000 (20:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346

Change-Id: I22114cc686a52c94234fbbc659998ab183c1747d

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa -s ours
Jeff Sharkey [Wed, 11 Oct 2017 20:27:42 +0000 (20:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa  -s ours
am: 70387afef9

Change-Id: Id60f3d902a5a2710310613ea0d12796ea46af931

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:26:40 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 019f31b499

Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:25:11 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: f32a4fad5d

Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:24:31 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 94e678c188

Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:24:16 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 1cdc675d7d

Change-Id: I117d8a1f9ab46f375277511da8f59df2db771cb7

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Wed, 11 Oct 2017 20:24:05 +0000 (20:24 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 8441943bfa  -s ours

Change-Id: I5c1980e7fb722d4d00194f3c953c91304137eea3

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 11 Oct 2017 18:28:21 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I3b96a50ff43d0d3611d3a59d12c265ca3fff5712

6 years agoSnap for 4388906 from e7f51073031da244b290fb844f0a381a461cd4e1 to oc-mr1-release
android-build-team Robot [Wed, 11 Oct 2017 07:27:02 +0000 (07:27 +0000)]
Snap for 4388906 from e7f51073031da244b290fb844f0a381a461cd4e1 to oc-mr1-release

Change-Id: Ib203c0c19cee62325afb7487952e31ebcc98f03b

6 years agoHero suggestion is announced as disabled by talkback
Ajay Nadathur [Tue, 10 Oct 2017 19:19:30 +0000 (12:19 -0700)]
Hero suggestion is announced as disabled by talkback

- Removed calls to disable view. No ripple effect seen even after that
bug: 65851388
NOTE: cherry picked from master.
Merged-In: I876696a3e7351d586e6d045c8b2d07676f96ea9d
Test: manually tested

Change-Id: Iae377e763ed62b9448221843ed77b4605ad81379

6 years agoAllow 64 char HEX string PSKs in WifiSettingsUi
Glen Kuhne [Mon, 9 Oct 2017 22:40:46 +0000 (15:40 -0700)]
Allow 64 char HEX string PSKs in WifiSettingsUi

A check for valid PSKs in the settings UI didnt capture the 64 character
HEX string case. Added a check for it.

Test: tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java
Test: manual verification
Bug: 67492639
Change-Id: Ide738c4a67f23b613883b4a69f8264a0ffb8a0bc

6 years agoSnap for 4384465 from 6ed9a789224f850da76587c0a00aacba8acb62c8 to oc-mr1-release
android-build-team Robot [Mon, 9 Oct 2017 07:22:05 +0000 (07:22 +0000)]
Snap for 4384465 from 6ed9a789224f850da76587c0a00aacba8acb62c8 to oc-mr1-release

Change-Id: I79c36cbd5451f067640c924cf6a97cd5eb3e7250

6 years agoSnap for 4383937 from 8bd54d4592a6289442d8b4175f4515730fcce6e1 to oc-mr1-release
android-build-team Robot [Sun, 8 Oct 2017 07:24:32 +0000 (07:24 +0000)]
Snap for 4383937 from 8bd54d4592a6289442d8b4175f4515730fcce6e1 to oc-mr1-release

Change-Id: I34062a839a5fb307eff417bf1bb304f33824f8ec

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 8 Oct 2017 06:57:28 +0000 (06:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 8 Oct 2017 02:13:23 +0000 (19:13 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I8e31d776f5036724722d7578be51651b5199e419

6 years agoMerge "Update wakeup anomaly to exclude blacklisted wakeups." into oc-mr1-dev
TreeHugger Robot [Sat, 7 Oct 2017 17:03:32 +0000 (17:03 +0000)]
Merge "Update wakeup anomaly to exclude blacklisted wakeups." into oc-mr1-dev

6 years agoUpdate wakeup anomaly to exclude blacklisted wakeups.
Andrew Sapperstein [Fri, 6 Oct 2017 01:19:32 +0000 (18:19 -0700)]
Update wakeup anomaly to exclude blacklisted wakeups.

Also disables all anomalies out of the box.

Provides the ability to ignore certain wakeups if blacklisted in
AnomalyDetectionPolicy. Compares each wakeup to the blacklist and
if it exists, does not include it in the count used to compare against
the threshold.

Change-Id: I038ca966aed5a030853b4786bc201397bf4f9b70
Merged-In: I4ef548bd0952be5f0d4e36df5698f287839d0704
Fixes: 67000019
Test: robotests

6 years agoMerge "Fix "Add Network" button on SavedAccessPoints page." into oc-mr1-dev
TreeHugger Robot [Fri, 6 Oct 2017 19:10:57 +0000 (19:10 +0000)]
Merge "Fix "Add Network" button on SavedAccessPoints page." into oc-mr1-dev

6 years agoSnap for 4378450 from 9cb867d6e352d08102973611dfd552e1b5b78d63 to oc-mr1-release
android-build-team Robot [Thu, 5 Oct 2017 07:29:02 +0000 (07:29 +0000)]
Snap for 4378450 from 9cb867d6e352d08102973611dfd552e1b5b78d63 to oc-mr1-release

Change-Id: I05c7811d0eb458a142602399c590bf330d266cf8

6 years agoAdd space around the data usage warning spinner.
Doris Ling [Wed, 4 Oct 2017 23:59:28 +0000 (16:59 -0700)]
Add space around the data usage warning spinner.

Use a custom item layout for the data usage warning unit selection
spinner to make the touch target bigger.

Change-Id: I2d73dc3ab4c99cea8f8c791c8c1346240456d6aa
Fixes: 66414539
Test: visual

6 years agoMerge "Use new no overlay flag instead app ops" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 20:38:58 +0000 (20:38 +0000)]
Merge "Use new no overlay flag instead app ops" into oc-mr1-dev

6 years agoMerge "Update support to not need dialog fragment" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 18:35:32 +0000 (18:35 +0000)]
Merge "Update support to not need dialog fragment" into oc-mr1-dev

6 years agoSnap for 4376088 from 0193e695970eb292c8166cc81ba1d94d4ec24286 to oc-mr1-release
android-build-team Robot [Wed, 4 Oct 2017 07:22:12 +0000 (07:22 +0000)]
Snap for 4376088 from 0193e695970eb292c8166cc81ba1d94d4ec24286 to oc-mr1-release

Change-Id: Iadce2c92def646b2552e794fd9a4d55b395bacb0

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.

This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.

This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.

This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.

This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.

This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoDO NOT MERGE. ActivityPicker shouldn't grant permissions.
Jeff Sharkey [Mon, 12 Jun 2017 23:33:58 +0000 (17:33 -0600)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.

This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431cb5648bcb46131551c133ba53ef870)

6 years agoUpdate support to not need dialog fragment
Salvador Martinez [Tue, 3 Oct 2017 01:17:29 +0000 (18:17 -0700)]
Update support to not need dialog fragment

This CL update support to not need the dialog fragment.

Test: robotests
Bug: 65552746
Change-Id: Ic4a21f05f04384795f4e616c2d6d914fc7dd3510

6 years agoMerge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into...
TreeHugger Robot [Tue, 3 Oct 2017 18:31:56 +0000 (18:31 +0000)]
Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev

6 years agoSnap for 4373604 from 6fe50e7224f26d7d0b41b8f233f06af918c0f07e to oc-mr1-release
android-build-team Robot [Tue, 3 Oct 2017 07:25:55 +0000 (07:25 +0000)]
Snap for 4373604 from 6fe50e7224f26d7d0b41b8f233f06af918c0f07e to oc-mr1-release

Change-Id: Icc61dcf6e0480982c79f31e1d5558dcdfbc35711

6 years agoUse new no overlay flag instead app ops
Svet Ganov [Tue, 3 Oct 2017 01:58:08 +0000 (18:58 -0700)]
Use new no overlay flag instead app ops

Test: updated DrawOverlayDetailsTest passes

bug:66936547

Change-Id: I7c17c95a2b44fd2ffd593a6eb03a16be034e9192

6 years agoFix "Add Network" button on SavedAccessPoints page.
Eric Schwarzenbach [Wed, 20 Sep 2017 23:34:23 +0000 (16:34 -0700)]
Fix "Add Network" button on SavedAccessPoints page.

The old onSubmit was a no-op. It now correctly pipes onSubmit to
WifiManager#save() with the new WifiConfiguration. On successful save,
it displays the new network in the list, and on failure, it displays a
toast indicating that the save action failed. Adds a test for the
WifiDialog behaviors on this page.

Bug: 66177765
Test: make RunSettingsRoboTests, manual - tested with Wifi enabled and
disabled, and with networks that were visible and not.
Change-Id: I27446aa49bc9efaf1ea1d6c6158928b62ce01ba2
Merged-In: I27446aa49bc9efaf1ea1d6c6158928b62ce01ba2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 2 Oct 2017 15:23:49 +0000 (08:23 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ib580d3bc9d6b979d5da92cc4ef3f207acdfaa48e

6 years agorelease-request-53526352-7b51-4ab1-a661-632ffc55dd7c-for-git_oc-mr1-release-4371241...
android-build-team Robot [Mon, 2 Oct 2017 04:14:29 +0000 (04:14 +0000)]
release-request-53526352-7b51-4ab1-a661-632ffc55dd7c-for-git_oc-mr1-release-4371241 snap-temp-L10900000107789672

Change-Id: I634cbc64e4d715e30629bf2815bf69c5bff8fcd1

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 28 Sep 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agorelease-request-ca7a0f27-e01e-4493-95dc-73b265f88cc9-for-git_oc-mr1-release-4365318...
android-build-team Robot [Thu, 28 Sep 2017 07:30:18 +0000 (07:30 +0000)]
release-request-ca7a0f27-e01e-4493-95dc-73b265f88cc9-for-git_oc-mr1-release-4365318 snap-temp-L33600000106883904

Change-Id: I7bb4696b1092d6fad70ccb7bce5cfdf6f91ff77b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 28 Sep 2017 02:51:32 +0000 (19:51 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: If92f24f85c26217b251503d846183f80da8b75ba

6 years agoMerge "Hide summary for type system" into oc-mr1-dev
TreeHugger Robot [Thu, 28 Sep 2017 02:11:54 +0000 (02:11 +0000)]
Merge "Hide summary for type system" into oc-mr1-dev

6 years agoMerge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
TreeHugger Robot [Thu, 28 Sep 2017 01:58:47 +0000 (01:58 +0000)]
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev

6 years agoSettings: Show HAL HDR+ option in user build
Chien-Yu Chen [Wed, 27 Sep 2017 18:38:15 +0000 (11:38 -0700)]
Settings: Show HAL HDR+ option in user build

Test: CameraHalHdrplusPreferenceControllerTest
Bug: 66919557
Change-Id: I02e89d34db56398e64e12616f34b8584df25c48b

6 years agorelease-request-a41f1f54-b764-45d4-b9ce-16ae3001be88-for-git_oc-mr1-release-4362737...
android-build-team Robot [Wed, 27 Sep 2017 07:30:43 +0000 (07:30 +0000)]
release-request-a41f1f54-b764-45d4-b9ce-16ae3001be88-for-git_oc-mr1-release-4362737 snap-temp-L87100000106492125

Change-Id: I512c38722337187c4c25fd0f112da3677ae549dc

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 27 Sep 2017 02:50:26 +0000 (02:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 26 Sep 2017 23:36:49 +0000 (16:36 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I55b6e616f1dd402c1c0cb7d17f593d4b7d904d85

6 years agorelease-request-787c7134-f106-4590-90f7-0fb685b91259-for-git_oc-mr1-release-4360035...
android-build-team Robot [Tue, 26 Sep 2017 07:29:12 +0000 (07:29 +0000)]
release-request-787c7134-f106-4590-90f7-0fb685b91259-for-git_oc-mr1-release-4360035 snap-temp-L24200000106060350

Change-Id: Ibc8846580d201cd062aa33005342e1c0e2cdc247

6 years agoGet rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
Rajeev Kumar [Mon, 25 Sep 2017 18:34:10 +0000 (11:34 -0700)]
Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.

This preference is not needed for Data plan settings page. This change
fixes the NPE which happens because we try to remove a preference which
is not added to the settings preference fragment.
Test: make RunSettingsRoboTests -j40
Bug: 64068792

Change-Id: Ibbcf1637b8aed1a94542ea3786170f2f318df4a9

6 years agoMerge "FRP: Fix positioning of cancel button in ConfirmCredential screens with intern...
TreeHugger Robot [Mon, 25 Sep 2017 11:11:53 +0000 (11:11 +0000)]
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev

6 years agorelease-request-2950741e-0b24-4d70-b748-67bb2b5435b5-for-git_oc-mr1-release-4357583...
android-build-team Robot [Sun, 24 Sep 2017 07:39:23 +0000 (07:39 +0000)]
release-request-2950741e-0b24-4d70-b748-67bb2b5435b5-for-git_oc-mr1-release-4357583 snap-temp-L55500000105655441

Change-Id: Ie81af6483904e91e56b6c5e0fab587eec653f842

6 years agoMerge "Reflect device encryption status" into oc-mr1-dev
TreeHugger Robot [Sat, 23 Sep 2017 00:28:27 +0000 (00:28 +0000)]
Merge "Reflect device encryption status" into oc-mr1-dev

6 years agoFix ANR issue caused by sharedpref commit() on suggestion event logging
Soroosh Mariooryad [Fri, 22 Sep 2017 23:10:02 +0000 (16:10 -0700)]
Fix ANR issue caused by sharedpref commit() on suggestion event logging

Test: RunSettingsRoboTests
Fixes: 66719302

Change-Id: I5e99a279d5c72409b8ca982148396f7d1e0d46b7

6 years agoHide summary for type system
jackqdyulei [Fri, 22 Sep 2017 20:27:23 +0000 (13:27 -0700)]
Hide summary for type system

Bug: 66573821
Test: RunSettingsRoboTests
Change-Id: I9d0f829cbe3577665d1c3d593e2ae95c0bbfa8b6

6 years agoMerge "Fixing issue with PiP settings not showing apps for other profiles." into...
Winson Chung [Fri, 22 Sep 2017 20:30:28 +0000 (20:30 +0000)]
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev

6 years agoReflect device encryption status
Ng Zhi An [Thu, 21 Sep 2017 00:51:28 +0000 (17:51 -0700)]
Reflect device encryption status

On the Settings & Location settings page, the
encryption_and_credential preference will statically show
"Phone encrypted" regardless of encryption status of phone.

This change changes Settings to check for encryption status
of the phone and update the summary as required.
This requires adding a string saying that the device is not encrypted.
And translations will have to happen after this is merged.

Change-Id: I2f5bd281d8f1ed32801446fcdd453ebbaa04bd32
Bug: 65535239
Fixes: 65535239
Test: manual, I had a gobo phone that was not encrypted,
made sure that it said "Phone not encrypted", then tap through
to encrypt phone, and then check that it is now "Phone encrypted".

6 years agoNotification importance/selected sound conflict fixes.
Alison Cichowlas [Thu, 14 Sep 2017 19:01:29 +0000 (15:01 -0400)]
Notification importance/selected sound conflict fixes.

- When you've selected "Silent" as your sound, update notification
importance messaging to match.
- When you explicitly move from a silent type of notifications to a
loud type, but have "Silent" selected as the sound, change the
sound to the default notification sound also.

Change-Id: I462785d593e1d6c7d1e87388aeee1bdcbcf6aa3d
Fixes: 63109928
Test: RunSettingsRoboTests, manual

6 years agoFRP: Fix positioning of cancel button in ConfirmCredential screens with internal...
Adrian Roos [Fri, 22 Sep 2017 11:28:54 +0000 (13:28 +0200)]
FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme

Change-Id: I152a777b60ac6bfb4c8e1399e31cc0d4b2ab9758
Fixes: 65408626
Test: manual

6 years agoFix icon for sim card in settings
Ng Zhi An [Wed, 20 Sep 2017 22:17:29 +0000 (15:17 -0700)]
Fix icon for sim card in settings

Change-Id: I1e235cad1712343e2990eab114fd2ef383aac77f
Bug: 65574460
Fixes: 65574460
Test: manually build and install Settings apk and open app to check

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Sep 2017 17:48:00 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoFixing issue with PiP settings not showing apps for other profiles.
Winson Chung [Fri, 15 Sep 2017 21:48:46 +0000 (14:48 -0700)]
Fixing issue with PiP settings not showing apps for other profiles.

Bug: 65417722
Test: make -j40 RunSettingsRoboTests
Change-Id: If3562dc7c2ddf07e2fc19591238dc3a7b4e9dba7
Merged-In: I3c3fc7a68c172eeccc767cd04b1393b38b36073e

6 years agoMerge "Sometimes there's no advanced settings" into oc-mr1-dev
Julia Reynolds [Thu, 21 Sep 2017 11:33:09 +0000 (11:33 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev

6 years agorelease-request-bbc747ae-190b-4d38-8704-432aa6396c16-for-git_oc-mr1-release-4351869...
android-build-team Robot [Thu, 21 Sep 2017 07:27:32 +0000 (07:27 +0000)]
release-request-bbc747ae-190b-4d38-8704-432aa6396c16-for-git_oc-mr1-release-4351869 snap-temp-L93800000104806132

Change-Id: I3c0ebca3cc6938022fe03b06d8bab9476967b780

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Sep 2017 01:33:03 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ic65c57bb8ef17b6babd0dab69072b07a70e2b5ec

6 years agoMove listening to brightness changes to onStart/onStop.
Doris Ling [Wed, 20 Sep 2017 22:36:14 +0000 (15:36 -0700)]
Move listening to brightness changes to onStart/onStop.

Currently, we register the brightness listener in onResume() and stop
listening in onPause(). When we launch the brightness selection bar, the
display settings is paused, and hence we don't get the brightness
update, and only refresh the percentage when the brightness bar is
dismissed.

Moving the listening logic to onStart()/onStop() instead, so that we
will get the updates all the time when the display settings is launched.

Change-Id: I6ed9c8485fdf7721374baff5cea5f7011b63d7ea
Fixes: 65981061
Test: make RunSettingsRoboTests

6 years agoBluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
Jack He [Tue, 12 Sep 2017 23:26:06 +0000 (16:26 -0700)]
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater

* LocalBluetoothAdapter is already a cache of BluetoothAdapter and its
  methods should be used directly to obtain states instead of caching them
  in BluetoothSummaryUpdater
    - Use LocalBluetoothAdapter.isEnabled() to check whether Bluetooth
      is enabled
    - Use LocalBluetoothAdapter.getBondedDevices() to get list of bonded
      devices
* BluetoothDevice is a stable Bluetooth API and its methods should not
  incur large latency. We should use API methods as much as possible to
  avoid intermediate wrappers
    - Use BluetoothDevice.isConnected() to check if a device is connected
* Add more logging messages in error conditions
* Show status as "Not Connected" when there is a state mismatch (i.e.
  adapter says it is connected, but no bonded device is connected)
* Updated unit tests to reflect the latest behavior

Bug: 65591907
Test: make, unit test, pair with Bluetooth devices, check Settings UI
Change-Id: I0fa54959c8bed8ac67a935f150785ba8197d0411