Jeff Sharkey
e803004863
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
2017-10-11 21:34:11 +00:00
Jeff Sharkey
c2198532bf
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346
am: 46bc2bd7bd
-s ours am: b410435a21
am: de7c312543
...
am: c1574a1ef8
Change-Id: I2eb18e0ad264898662f921ba3cf582a2875bdad4
2017-10-11 21:33:51 +00:00
Jeff Sharkey
250d5e60b0
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
2017-10-11 21:33:01 +00:00
Jeff Sharkey
f70906f2da
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064
...
am: 8bdd94e292
Change-Id: I12e601375713fd8491007e93ae5133e3bbfd0b6c
2017-10-11 21:32:33 +00:00
Fan Zhang
78896c40ac
Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8
-s ours am: e39bcb6bf5
-s ours
...
am: eef095d0ee
-s ours
Change-Id: I14bd887cac26c0b3ced671d971f4d059a061088d
2017-10-11 21:31:35 +00:00
Jeff Sharkey
09112f231c
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: Icc827672d37662817ccf7e0e2be21c685f96bc79
2017-10-11 21:28:38 +00:00
Jeff Sharkey
c1574a1ef8
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346
am: 46bc2bd7bd
-s ours am: b410435a21
...
am: de7c312543
Change-Id: I46cb89e7594fae1988f5ea08416549019452332e
2017-10-11 21:27:27 +00:00
Jeff Sharkey
8bdd94e292
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
...
am: f4e2e26064
Change-Id: I21d3d925c533b9bbcb8bef5807662a1ad6186394
2017-10-11 21:26:28 +00:00
Jeff Sharkey
4d61a1bd15
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
2017-10-11 21:24:25 +00:00
Jeff Sharkey
2433b6dc44
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
2017-10-11 21:21:40 +00:00
Jeff Sharkey
3aa36a6afb
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
2017-10-11 21:20:09 +00:00
Jeff Sharkey
47bc5fba05
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
am: 7c41707eaf
am: 979efb53d0
am: fe1daa6eda
...
am: efe9e7e003
-s ours
Change-Id: If71fe96139c86fce8be3d1866342a050df3c9f6f
2017-10-11 21:12:41 +00:00
Fan Zhang
eef095d0ee
Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8
-s ours
...
am: e39bcb6bf5
-s ours
Change-Id: I0e2e798dee860a0d708fec3313b3b4c7f2ab3f79
2017-10-11 21:11:25 +00:00
Jeff Sharkey
de7c312543
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346
am: 46bc2bd7bd
-s ours
...
am: b410435a21
Change-Id: I91421c6629af2131e7aaeadac048c92da9653212
2017-10-11 21:10:10 +00:00
Jeff Sharkey
f4e2e26064
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
...
am: 9c39da39df
Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
2017-10-11 21:09:20 +00:00
Jeff Sharkey
d721694b79
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
2017-10-11 21:01:29 +00:00
Fan Zhang
e39bcb6bf5
Merge "Move SettingsRobolectricTestRunner to testutils."
...
am: 16db22a9c8
-s ours
Change-Id: I7a4a2d5326b1e617beab32a4be4bfe5b7de7409a
2017-10-11 21:01:23 +00:00
Jeff Sharkey
53a69985b3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb
am: 45926efd0f
-s ours am: 89791cb5c3
...
am: b3d4bc8239
Change-Id: I02141baa2a53d2982856052a923be6ddd076c55f
2017-10-11 21:00:27 +00:00
Jeff Sharkey
efe9e7e003
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
am: 7c41707eaf
am: 979efb53d0
...
am: fe1daa6eda
Change-Id: I943b70a1dfc085ff0a4e4e46afb29aec1aa6c965
2017-10-11 20:57:51 +00:00
Jeff Sharkey
9c5abedc54
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa
-s ours am: 70387afef9
am: 9173362f4e
...
am: cf1c0b1f58
Change-Id: I502a85737c41f79068e2a2d7417cce8e52957794
2017-10-11 20:49:46 +00:00
Jeff Sharkey
50af9f6724
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa
-s ours am: 70387afef9
am: 9173362f4e
...
am: 0b34b23f8b
Change-Id: I8c323e0cde1c1bf060c6214b7f0a81441a5e7e5b
2017-10-11 20:47:27 +00:00
Jeff Sharkey
86cc9a681d
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab
am: 95bbef26d7
am: ba66bb8a43
-s ours
...
am: 004f90f35e
Change-Id: I2665557fb25ced0978a90fed4edff989011e01ed
2017-10-11 20:46:28 +00:00
Treehugger Robot
16db22a9c8
Merge "Move SettingsRobolectricTestRunner to testutils."
2017-10-11 20:45:19 +00:00
Jeff Sharkey
b3d4bc8239
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb
am: 45926efd0f
-s ours
...
am: 89791cb5c3
Change-Id: Ie179a077b08e79040603c467e0a912731636e2f2
2017-10-11 20:45:04 +00:00
Jeff Sharkey
fe1daa6eda
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
am: 7c41707eaf
...
am: 979efb53d0
Change-Id: Iad023fb1a0ff8fded7963b5e7087457803fe213c
2017-10-11 20:44:53 +00:00
Jeff Sharkey
b410435a21
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
am: 0bcee25346
...
am: 46bc2bd7bd
-s ours
Change-Id: I55b5048ea4ecb689a7d483afeb174a153cc54fdc
2017-10-11 20:39:07 +00:00
Jeff Sharkey
cf1c0b1f58
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa
-s ours am: 70387afef9
...
am: 9173362f4e
Change-Id: Ifeffebaae3402a18fc1eb4883f46f7827e2b23df
2017-10-11 20:36:04 +00:00
Jeff Sharkey
0b34b23f8b
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa
-s ours am: 70387afef9
...
am: 9173362f4e
Change-Id: I8eb3e136b4edb5858a681fb69c0f90d216255e55
2017-10-11 20:35:37 +00:00
Jeff Sharkey
004f90f35e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab
am: 95bbef26d7
...
am: ba66bb8a43
-s ours
Change-Id: I3431178e94b81aa61b7f829217a40fdee4eac141
2017-10-11 20:35:23 +00:00
Jeff Sharkey
89791cb5c3
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
am: 556688abdb
...
am: 45926efd0f
-s ours
Change-Id: Ieeea7848f879564074e1fb32d4c5c834d21e63cc
2017-10-11 20:34:40 +00:00
TreeHugger Robot
9c39da39df
Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
2017-10-11 20:32:55 +00:00
Jeff Sharkey
ba66bb8a43
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
am: e38a7f42ab
...
am: 95bbef26d7
Change-Id: I32314303ab0926d93ae035166e323bcce847b7bd
2017-10-11 20:32:38 +00:00
Jeff Sharkey
45926efd0f
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499
...
am: 556688abdb
Change-Id: Ia7daf15c3d9fc81ae8fdef25f79cc13558639e98
2017-10-11 20:31:41 +00:00
Jeff Sharkey
979efb53d0
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d
...
am: 7c41707eaf
Change-Id: Ifc8c25371b0d2062e4c51ee6fcbf75e275331b30
2017-10-11 20:29:25 +00:00
Jeff Sharkey
95bbef26d7
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188
...
am: e38a7f42ab
Change-Id: I9fffe94faecb7d36ac68ebfc388af01e4871031e
2017-10-11 20:28:13 +00:00
Jeff Sharkey
46bc2bd7bd
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d
...
am: 0bcee25346
Change-Id: I22114cc686a52c94234fbbc659998ab183c1747d
2017-10-11 20:28:11 +00:00
Jeff Sharkey
9173362f4e
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 8441943bfa
-s ours
...
am: 70387afef9
Change-Id: Id60f3d902a5a2710310613ea0d12796ea46af931
2017-10-11 20:27:42 +00:00
Jeff Sharkey
556688abdb
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 019f31b499
Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e
2017-10-11 20:26:40 +00:00
Jeff Sharkey
7c41707eaf
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: f32a4fad5d
Change-Id: I54e65289ff205196bd4fba9f0d40dc1f9f116e2b
2017-10-11 20:25:11 +00:00
Jeff Sharkey
e38a7f42ab
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 94e678c188
Change-Id: Iffc23a1e80389d1afe9b10a7e992d9d19a33fe11
2017-10-11 20:24:31 +00:00
Jeff Sharkey
0bcee25346
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 1cdc675d7d
Change-Id: I117d8a1f9ab46f375277511da8f59df2db771cb7
2017-10-11 20:24:16 +00:00
Jeff Sharkey
70387afef9
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
...
am: 8441943bfa
-s ours
Change-Id: I5c1980e7fb722d4d00194f3c953c91304137eea3
2017-10-11 20:24:05 +00:00
Fan Zhang
df94389492
Move SettingsRobolectricTestRunner to testutils.
...
Change-Id: Ia0017983b844cabafc10478adf4839f5755f514c
Merged-In: I6612b1f26404587301c534c8ba60e39d59d6c840
Fixes: 67688380
Test: robotests
2017-10-11 12:27:12 -07:00
Bill Yi
5fdc38e696
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I3b96a50ff43d0d3611d3a59d12c265ca3fff5712
2017-10-11 11:28:21 -07:00
Ajay Nadathur
8f273000f0
Hero suggestion is announced as disabled by talkback
...
am: e7f5107303
Change-Id: Idba7b963c3a158335eb59fecdf036f444d3808b8
2017-10-11 00:06:05 +00:00
Ajay Nadathur
e7f5107303
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
2017-10-10 16:36:35 -07:00
Glen Kuhne
ddf705903e
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
2017-10-10 13:12:21 -07:00
Li YanJia
b699603f68
Fix PrivateVolumeSettings be launched repeatedly
...
Symptom:
After manually pull out the removable sd card or usb storage in
StorageSettings screen, it automatically moves to
PrivateVolumeSettings screen. This time, launching
PrivateVolumeSettings Activity is triggered six times and end-user
has to press back key six times to exit PrivateVolumeSettings
screen.
Root cause:
When sd card is pulled out, StorageSettings got three state change
event (UNMOUNTED, BAD_REMOVAL and onDiskDestroyed) through
StorageEventListener that triggers launching PrivateVolumeSettings
screen. In addition StorageSettings register the listener two
times, then StorageSettings receives six event in total.
Therefore, PrivateVolumeSettings screen is launched six times.
Solution:
Skip launching PrivateVolumeSettings if it's already triggered.
And removed the duplicated listener registration.
Bug: 67612903
Change-Id: Iabef51677a393977b7be29fc54aa050434213500
2017-10-10 12:49:32 +09:00
edgar.huang
bd0d33e3bd
There is no NEXT button in find sensor screen of fingerprint.
...
Precondition: set the Font size and Display size to largest
Enter into the find sensor screen and the NEXT button is missing.
Test: manual - Enter into the find sensor screen -
and can find the NEXT button after sliding the screen.
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I8f6219ab22abad98111f016d633bf100dc3222ce
2017-10-10 01:51:33 +00:00
Bill Yi
e81904ece6
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 6ed9a78922
-s ours
Change-Id: I1d35b06b119081d46680035c32858572a8acad35
2017-10-08 06:59:18 +00:00