Paul Crowley
41c1977978
Merge "Add a new flow for decryption checking." into lmp-mr1-dev
2014-11-07 00:26:45 +00:00
Jeff Davidson
0fc9271b21
am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card.
...
* commit 'c4a686086cf85808fea1f10a6072d197cffb686b':
Remove the Wi-Fi Assistant card.
2014-11-07 00:24:21 +00:00
Jeff Davidson
c4a686086c
am 99f191f5: Remove the Wi-Fi Assistant card.
...
* commit '99f191f5856bb266854d7b08a50523626eb70f72':
Remove the Wi-Fi Assistant card.
2014-11-07 00:09:36 +00:00
Jeff Davidson
99f191f585
Remove the Wi-Fi Assistant card.
...
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.
Bug: 13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
2014-11-06 13:30:34 -08:00
Baligh Uddin
15adc9b3ac
Import translations. DO NOT MERGE
...
Change-Id: I547111eb6c7ff68ebe835d65bb24e0a841ecdb90
Auto-generated-cl: translation import
2014-11-06 10:02:24 -08:00
Baligh Uddin
03fb1255ce
Import translations. DO NOT MERGE
...
Change-Id: I3b866f948797d2f710f53ce51aaa54b373a346e0
Auto-generated-cl: translation import
2014-11-06 09:42:35 -08:00
Baligh Uddin
039b456e1f
Import translations. DO NOT MERGE
...
Change-Id: I8bac21044a928351bf38da831b7239694756fb2d
Auto-generated-cl: translation import
2014-11-06 09:37:03 -08:00
Paul Crowley
529834dae1
Add a new flow for decryption checking.
...
Bug: 17875087
Change-Id: I78ba98901bc74ae654414c0a4a303b104a629965
2014-11-06 15:49:39 +00:00
Jeff Davidson
3959e9b933
am 7b17e24d: am a9086ee9: Show accurate connection status for ephemeral networks. automerge: b46a919
...
* commit '7b17e24d36e5fd3263204a4ee666e85a4a006b90':
Show accurate connection status for ephemeral networks.
2014-11-06 02:27:33 +00:00
Jeff Davidson
7b17e24d36
am a9086ee9: Show accurate connection status for ephemeral networks. automerge: b46a919
...
* commit 'a9086ee973d61ca009f11372b8182572664b15cd':
Show accurate connection status for ephemeral networks.
2014-11-06 02:22:51 +00:00
Jeff Davidson
a9086ee973
Show accurate connection status for ephemeral networks.
...
automerge: b46a919
2014-11-06 02:18:57 +00:00
Jeff Davidson
b46a9194fe
Show accurate connection status for ephemeral networks.
...
Configurations for these networks are not returned in
getConfiguredNetworks() and likely shouldn't be as clients of this API
would not expect them. (Note also that the ephemeral bit is marked
@hide). But the framework may connect to them regardless.
In these cases, as long as the connection status is something other
than the coarse-level DISCONNECTED, we show the status to be an
accurate representation of Wi-Fi state. (To make this possible, we
pass around the full NetworkInfo instead of just the DetailedState,
allowing us to get the coarse state where needed).
When long pressing on a non-DISCONNECTED ephemeral network, we offer
the ability to save the configuration. (Note that this flow is
currently broken and being tracked by another bug, but the behavior is
consistent with what happens when you simply click on the SSID).
Bug: 18205278
Change-Id: I30592c89546068c796f458a86bb26eb3b28c64df
2014-11-05 15:04:14 -08:00
Sanket Padawe
db9366ad60
am 88bcd116: am 0d482f24: am 815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
...
* commit '88bcd116eb74ceb9756b71e9e208c25c41c98b7a':
Change for setting transparency of sim colors.
2014-11-05 20:53:39 +00:00
John Spurlock
6358a4f1b6
am bdeb3b9b: am 2d256206: Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev automerge: 92f0246
...
* commit 'bdeb3b9beed36d4c62255961c358d23071e6687b':
Settings: Allow user to configure "None" for downtime.
2014-11-05 20:53:38 +00:00
Sanket Padawe
88bcd116eb
am 0d482f24: am 815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
...
* commit '0d482f2483183df0856e4f56e962c22cee5869d7':
Change for setting transparency of sim colors.
2014-11-05 20:44:25 +00:00
John Spurlock
bdeb3b9bee
am 2d256206: Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev automerge: 92f0246
...
* commit '2d25620627448ba91bf6beafc174d5f6c6a4bbb6':
Settings: Allow user to configure "None" for downtime.
2014-11-05 20:43:46 +00:00
Sanket Padawe
0d482f2483
am 815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
...
* commit '815c61d729715e6d7a19fbf4f039d59d0dddc265':
Change for setting transparency of sim colors.
2014-11-05 20:35:27 +00:00
Sanket Padawe
815c61d729
Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
2014-11-05 20:30:26 +00:00
John Spurlock
2d25620627
Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev
...
automerge: 92f0246
2014-11-05 19:34:02 +00:00
John Spurlock
92f02463fc
Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev
2014-11-05 19:17:50 +00:00
Andres Morales
4610421f40
am 7d3e182c: Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9 automerge: eb55ac9
...
* commit '7d3e182c18978c7da43194d9deb564e5724b06e2':
Confirm enabling OEM unlock with warning dialog
Request PIN confirmation to enable OEM unlock
2014-11-05 18:48:07 +00:00
Paul Crowley
40f17dbed9
am 1e4d6e64: Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge: e6ad7bf automerge: 966a1ca
...
* commit '1e4d6e64a43a1eb5de893a71178c64d240d01f9f':
Don't show a pattern-specific prompt at encryption time.
2014-11-05 18:48:06 +00:00
Andres Morales
7d3e182c18
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9
...
automerge: eb55ac9
2014-11-05 18:08:26 +00:00
Paul Crowley
1e4d6e64a4
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge: e6ad7bf
...
automerge: 966a1ca
2014-11-05 18:05:05 +00:00
Andres Morales
eb55ac90dd
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
...
automerge: ea4d9a9
2014-11-05 17:38:35 +00:00
John Spurlock
645cc5cf82
Settings: Allow user to configure "None" for downtime.
...
New setting under Zen > Downtime subcategory. Also rename the
category header, remove obsolete parenthetical.
Bug: 16373455
Change-Id: Ic3430e1795fc79c315dea3c24d88dfcde6742849
2014-11-05 12:04:16 -05:00
Paul Crowley
966a1cadbf
Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev
...
automerge: e6ad7bf
2014-11-05 16:35:53 +00:00
Andres Morales
ea4d9a9eca
Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev
...
* changes:
Confirm enabling OEM unlock with warning dialog
Request PIN confirmation to enable OEM unlock
2014-11-05 16:31:54 +00:00
Sanket Padawe
8942c62165
Change for setting transparency of sim colors.
...
Changes for setting transparency of sim colors in sim settings UI.
Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
2014-11-04 18:14:39 -08:00
Paul Crowley
01fbd9fd3c
Don't show a pattern-specific prompt at encryption time.
...
Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
2014-11-05 00:43:33 +00:00
vandwalle
e2ebb88560
am 68421fd5: am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
...
* commit '68421fd5c66d2c14ffddc989ccb2815c4da74352':
sanitize strings and error messages in wiFi picker
2014-11-04 20:23:28 +00:00
vandwalle
68421fd5c6
am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
...
* commit 'e1cb279f3ebb8813c07c988c3a432825563ccfda':
sanitize strings and error messages in wiFi picker
2014-11-04 20:18:58 +00:00
vandwalle
e1cb279f3e
am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
...
* commit '508a693c9a240a5f297704c8cc837a3cb5702d6c':
sanitize strings and error messages in wiFi picker
2014-11-04 20:12:02 +00:00
vandwalle
508a693c9a
Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
2014-11-04 20:07:44 +00:00
vandwalle
b245731e88
sanitize strings and error messages in wiFi picker
...
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
2014-11-04 12:05:30 -08:00
Andres Morales
48b0b241aa
Confirm enabling OEM unlock with warning dialog
...
Bug: 18227644
Change-Id: I326a4cf215ef0e30fd8a054964e0efeb3f627d89
2014-11-04 10:58:19 -08:00
Alexandra Gherghina
7e7e54764e
am ab054dc1: am 06ad8ce5: am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
...
* commit 'ab054dc138041e5cb77b24aab0f85a40e78eb942':
Apply predefined icon and label to managed profiles
2014-11-04 14:03:02 +00:00
Alexandra Gherghina
ab054dc138
am 06ad8ce5: am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
...
* commit '06ad8ce5974de67017abb8773646743295cf44f4':
Apply predefined icon and label to managed profiles
2014-11-04 13:59:22 +00:00
Alexandra Gherghina
06ad8ce597
am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
...
* commit 'd47f15a4746cda8522fc986a1b2478c76c46d71f':
Apply predefined icon and label to managed profiles
2014-11-04 13:54:52 +00:00
Alexandra Gherghina
d47f15a474
Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev
2014-11-04 13:50:52 +00:00
PauloftheWest
ae9b59faa3
am f75a8182: Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge: ba53a84 automerge: e8cf3ee
...
* commit 'f75a8182bd64983d3f9ec7208d0224a282af51e0':
Added cellular data popup in DataUsage
2014-11-04 01:13:53 +00:00
Andres Morales
73bbd4cbff
Request PIN confirmation to enable OEM unlock
...
Bug: 18191568
Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
2014-11-03 17:02:11 -08:00
PauloftheWest
f75a8182bd
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev automerge: ba53a84
...
automerge: e8cf3ee
2014-11-04 00:06:12 +00:00
PauloftheWest
e8cf3eed17
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
...
automerge: ba53a84
2014-11-03 23:28:42 +00:00
PauloftheWest
ba53a846b1
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
2014-11-03 23:00:19 +00:00
Geoff Mendal
1e365f0a71
Merge "Import translations. DO NOT MERGE"
2014-11-03 18:32:06 +00:00
Geoff Mendal
c077365e94
Import translations. DO NOT MERGE
...
Change-Id: I51545d7f6fb134587651a2cc90a8f5d1b65f759c
Auto-generated-cl: translation import
2014-11-03 10:19:35 -08:00
Geoff Mendal
0de0fe0afc
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-03 18:03:03 +00:00
Geoff Mendal
99a3f80773
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-03 18:01:41 +00:00
Geoff Mendal
a9f8d29262
Import translations. DO NOT MERGE
...
Change-Id: Id22a6dbb43d8911376c6cb3be95d6fce0011638f
Auto-generated-cl: translation import
2014-11-03 10:01:02 -08:00
