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
Fabrice Di Meglio
b81e7937b3
Fix bug #17936169 subsettings activity crashes on emulator for android-21
...
- prevent the NPE by checking if the UsbManager is not null
Change-Id: I65114ffe66f90d6de66bb98ad841df64840278ce
2014-11-06 15:16:09 -08: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
Stuart Scott
65ea49a2fb
am 74924424: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: ac61828
...
* commit '7492442451b960b1b8667d3424d81b8590c842c3':
Fix NPE when parceling SubInfoRecord
2014-11-06 19:26:57 +00:00
Stuart Scott
7492442451
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
...
automerge: ac61828
2014-11-06 18:54:42 +00:00
Stuart Scott
ac61828bed
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
2014-11-06 18:25:50 +00:00
Baligh Uddin
960c98f91d
Import translations. DO NOT MERGE
...
Change-Id: I18ddc7f1f2104dad793af6e7a8978b0d36758258
Auto-generated-cl: translation import
2014-11-06 09:49:04 -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
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
Stuart Scott
7928cd85dc
Fix NPE when parceling SubInfoRecord
...
bug:18256375
Change-Id: I04ab5086e3f06abc6ce44ef69501022564a95b88
2014-11-05 15:08:16 -08: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
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
Sanket Padawe
55674c31aa
am bac2d4d6: am 63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev
...
* commit 'bac2d4d6a60550ad6af7a560e1d6b14eabfef1be':
Sim name doesn't persist on reboot
2014-11-05 19:01:07 +00:00
Sanket Padawe
bac2d4d6a6
am 63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev
...
* commit '63530b56bba0de22309633d4f05fd2e74901474d':
Sim name doesn't persist on reboot
2014-11-05 18:50:14 +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
Sanket Padawe
63530b56bb
Merge "Sim name doesn't persist on reboot" into lmp-mr1-dev
2014-11-05 17:59:41 +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
Paul Crowley
e6ad7bf052
Merge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev
2014-11-05 15:57:09 +00:00
Alexandra Gherghina
7ce01fe352
am ed321aec: am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
...
* commit 'ed321aec3359eca1d3b417e93bd1de1f64c713cb':
Save missing state in ConfirmAutoSyncChangeFragment
2014-11-05 10:15:02 +00:00
Alexandra Gherghina
ed321aec33
am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
...
* commit '7db037a989ea9c106ea404681cfe22a1fd2a2973':
Save missing state in ConfirmAutoSyncChangeFragment
2014-11-05 10:09:58 +00:00
Alexandra Gherghina
7db037a989
Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
2014-11-05 10:06:36 +00:00
Stuart Scott
e1c8927961
am 05c19a45: am b153181c: Use CharSequence for DisplayName
...
* commit '05c19a45e2b46f70323b33818eba657ef40ad455':
Use CharSequence for DisplayName
2014-11-05 04:05:35 +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
Stuart Scott
05c19a45e2
am b153181c: Use CharSequence for DisplayName
...
* commit 'b153181c9c597085769d69796ecf07ec6d4433d2':
Use CharSequence for DisplayName
2014-11-05 02:13:21 +00:00
Sanket Padawe
c9f823e22a
Sim name doesn't persist on reboot
...
Sim name was not persisting on changed by user because of wrong api call.
Bug: 18024820
Change-Id: I7dee4a181f17f8cfabe48fefb92d7fc407efbe59
2014-11-04 17:34:47 -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
Alexandra Gherghina
6911af1cbe
Save missing state in ConfirmAutoSyncChangeFragment
...
Bug: 18117345
Change-Id: I5f176f330e51b23fe0935d435aa8bc3904e42d36
2014-11-04 23:00:34 +00:00
Stuart Scott
b153181c9c
Use CharSequence for DisplayName
...
Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
2014-11-04 14:52:23 -08: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
204624ca12
am 3016f721: am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
...
* commit '3016f721f1215bd6bb54f6e16a46a63d3557ee55':
Hide managed profile entry in secondary users
2014-11-04 13:59:23 +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
3016f721f1
am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
...
* commit '2a03d8e2991b64740c803c65e2e09ba69180a02e':
Hide managed profile entry in secondary users
2014-11-04 13:54:53 +00:00
