Bill Yi
8c88b53dda
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
...
am: bd429f42cb
2017-07-26 17:48:32 +00:00
Bill Yi
05185952c8
Import translations. DO NOT MERGE
...
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:27:31 -07:00
Bill Yi
db8172a4fe
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
...
am: eca6781a49
2017-07-26 17:26:06 +00:00
Antony Sargent
2665600b75
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
...
am: 1e69f27a41
2017-07-26 17:09:14 +00:00
Bill Yi
eca6781a49
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
2017-07-26 17:04:23 +00:00
Bill Yi
bd429f42cb
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
2017-07-26 16:46:51 +00:00
TreeHugger Robot
402abcc9df
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-26 16:31:13 +00:00
Antony Sargent
1c84e34cb5
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
...
am: c3cd88c302
2017-07-26 16:19:02 +00:00
Antony Sargent
1e69f27a41
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
...
am: 9fb7a3b8b4
2017-07-26 16:18:50 +00:00
Bill Yi
0d07e5e3f3
Import translations. DO NOT MERGE
...
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 08:07:49 -07:00
Bill Yi
d5390dac46
Import translations. DO NOT MERGE
...
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 07:32:24 -07:00
Antony Sargent
c3cd88c302
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
...
am: 9fb7a3b8b4
2017-07-26 11:12:39 +00:00
TreeHugger Robot
9fb7a3b8b4
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
2017-07-26 10:53:30 +00:00
Bill Yi
c2d779e568
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 0c3ee7c15d -s ours
...
am: 565664fad7
2017-07-26 08:46:06 +00:00
Bill Yi
565664fad7
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 0c3ee7c15d
2017-07-26 08:24:19 +00:00
Android Build Merger (Role)
13607bdea0
Merge "Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: 9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp
2017-07-26 08:06:55 +00:00
Bill Yi
37425295cf
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
...
am: 9d33ddc3f7
2017-07-26 08:06:37 +00:00
Bill Yi
2bfaa1856b
Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
...
am: a2954b3232
2017-07-26 08:06:35 +00:00
Bill Yi
0c3ee7c15d
Import translations. DO NOT MERGE
...
am: 8a25fb603a
2017-07-26 08:06:13 +00:00
Bill Yi
9d33ddc3f7
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 9d7971905c
2017-07-26 08:03:07 +00:00
Bill Yi
a2954b3232
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 9d7971905c
2017-07-26 08:03:05 +00:00
Bill Yi
9d7971905c
Import translations. DO NOT MERGE
...
am: 8a25fb603a
2017-07-26 07:59:05 +00:00
Antony Sargent
c00fedc639
Allow open password dialog for wrong-password wifi access points
...
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.
Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:
-The TestAccessPointBuilder class wasn't being found at runtime because
it was getting stripped out at build time due to not being used in
settings.
-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
asserting that we don't end up with multiple entries for the same SSID
in the access point list when changing the security state for the AP,
but it was accidentally passing multiple AP's with the same name the
first time.
Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78
2017-07-26 07:00:51 +00:00
Android Build Merger (Role)
0792518ba8
Merge "Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09 am: a65e3e6795" into oc-mr1-dev-plus-aosp
2017-07-26 06:38:57 +00:00
Jack He
8f8d7ba466
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
...
am: a65e3e6795
2017-07-26 06:38:40 +00:00
Jack He
85d9a7c48a
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
...
am: dfc2fb14c6
2017-07-26 06:38:32 +00:00
Jack He
a65e3e6795
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
2017-07-26 06:34:30 +00:00
Jack He
dfc2fb14c6
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
2017-07-26 06:34:29 +00:00
TreeHugger Robot
0c6f001c09
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
2017-07-26 06:28:44 +00:00
Android Build Merger (Role)
40449ad439
Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a am: 3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
2017-07-26 06:27:25 +00:00
Doris Ling
01c408bc76
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a
...
am: 3ab3fc9ee4
2017-07-26 06:27:07 +00:00
Doris Ling
566eea85dc
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a -s ours
...
am: dac62d24f4
2017-07-26 06:27:06 +00:00
Doris Ling
3ab3fc9ee4
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
...
am: 4906a2a38a
2017-07-26 06:23:08 +00:00
Doris Ling
dac62d24f4
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
...
am: 4906a2a38a
2017-07-26 06:23:03 +00:00
Fan Zhang
0c8c2ec24e
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am: 5fb56c5b37
...
am: 2583cbe16b
2017-07-26 06:14:39 +00:00
TreeHugger Robot
4906a2a38a
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
2017-07-26 06:11:07 +00:00
Fan Zhang
6a8f288d3f
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am: 5fb56c5b37
...
am: 43ef9743a2
2017-07-26 06:11:00 +00:00
Fan Zhang
43ef9743a2
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
...
am: 5fb56c5b37
2017-07-26 06:07:37 +00:00
Fan Zhang
2583cbe16b
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
...
am: 5fb56c5b37
2017-07-26 06:07:30 +00:00
Fan Zhang
5fb56c5b37
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
2017-07-26 05:59:57 +00:00
Fan Zhang
c2c42de513
Merge "Update misc strings" into oc-mr1-dev
...
am: 34d30267e3
2017-07-26 05:02:56 +00:00
TreeHugger Robot
34d30267e3
Merge "Update misc strings" into oc-mr1-dev
2017-07-26 04:59:29 +00:00
Bill Yi
8a25fb603a
Import translations. DO NOT MERGE
...
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-25 21:25:48 -07:00
Doris Ling
99d3b353c6
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
...
am: 0224a409a9
2017-07-26 04:22:58 +00:00
Doris Ling
0224a409a9
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
2017-07-26 04:14:07 +00:00
Christine Franks
58dfff8468
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316
...
am: be0ac89704
2017-07-26 03:04:29 +00:00
Christine Franks
02de4d0e23
Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316
...
am: a1f56b5faa
2017-07-26 02:59:16 +00:00
Christine Franks
be0ac89704
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
...
am: a7e10e0316
2017-07-26 02:56:36 +00:00
Christine Franks
a1f56b5faa
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
...
am: a7e10e0316
2017-07-26 02:52:52 +00:00
Christine Franks
a7e10e0316
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
2017-07-26 02:38:08 +00:00
