Fabrice Di Meglio
fff7e020e8
Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
2014-11-07 01:39:25 +00:00
Fabrice Di Meglio
fe144d7b72
Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted
...
- dismiss keyboard when the query is submitted by returning the correct value to
onQueryTextSubmit()
Change-Id: I3da0606ea7c5e65c860784a867a54ad30589b3a7
2014-11-06 17:36:28 -08:00
Fabrice Di Meglio
d34dd4fb9e
Update synonyms and fix some issues related to them
...
- update synonyms definitions
- fix issue with L release regression for indexing "Backup & reset":
was missing the marker interface "Indexable"
- fix non working synonyms for "Language & input": their declaration
was done in the XML preference file but was not used because the
SearchIndexProvider was built "by hand"
See bug #17474866 Settings search synonyms needs an update
Change-Id: Iceab71a0e3214f3a8ba0dcd77756c3632609c5ce
2014-11-06 16:57:04 -08:00
Paul Crowley
41c1977978
Merge "Add a new flow for decryption checking." into lmp-mr1-dev
2014-11-07 00:26:45 +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
38211d1d23
am 65ea49a2: am 74924424: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: ac61828
...
* commit '65ea49a2fb8363dd57ac2d881a4c34af70e07c7c':
Fix NPE when parceling SubInfoRecord
2014-11-06 21:08:03 +00:00
Stuart Scott
ac61828bed
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
2014-11-06 18:25:50 +00: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
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
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
815c61d729
Merge "Change for setting transparency of sim colors." into lmp-mr1-dev
2014-11-05 20:30:26 +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
237b24e2f3
am 55674c31: am bac2d4d6: am 63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev
...
* commit '55674c31aab544f3856f2ff23f26745b8bcb65c3':
Sim name doesn't persist on reboot
2014-11-05 19:07:23 +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
Sanket Padawe
63530b56bb
Merge "Sim name doesn't persist on reboot" into lmp-mr1-dev
2014-11-05 17:59:41 +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
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
11fa427f6a
am 7ce01fe3: am ed321aec: am 7db037a9: Merge "Save missing state in ConfirmAutoSyncChangeFragment" into lmp-mr1-dev
...
* commit '7ce01fe3529c4095301dc49836953a00f604eeed':
Save missing state in ConfirmAutoSyncChangeFragment
2014-11-05 10:19:12 +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
ba1a39ff06
am e1c89279: am 05c19a45: am b153181c: Use CharSequence for DisplayName
...
* commit 'e1c8927961c337e633db994d456e627e296d1210':
Use CharSequence for DisplayName
2014-11-05 04:17:51 +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
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
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
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
060989bc28
am 204624ca: am 3016f721: am 2a03d8e2: Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
...
* commit '204624ca12b8a11256dc4a8a41ef252bd68f20e7':
Hide managed profile entry in secondary users
2014-11-04 14:03:03 +00: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
2a03d8e299
Merge "Hide managed profile entry in secondary users" into lmp-mr1-dev
2014-11-04 13:51:05 +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
Stuart Scott
5ff258d6ea
am 6b12f54a: am 173ef409: Clean up public API of SubInfoRecord. automerge: 3ada2ec
...
* commit '6b12f54abb6b3ed8327b941062c9293b26534511':
Clean up public API of SubInfoRecord.
2014-11-04 03:19:05 +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
Andrew Lee
f36b2692af
am 1d671eb2: am c53c5835: am 8d4f7f94: Merge "Update class name for FdnList." into lmp-mr1-dev
...
* commit '1d671eb24be9f585b9ca83e820cb8869313729f6':
Update class name for FdnList.
2014-11-04 01:13:52 +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
Stuart Scott
3ada2ecbe0
Clean up public API of SubInfoRecord.
...
bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df
2014-11-03 16:00:10 -08:00
PauloftheWest
ba53a846b1
Merge "Added cellular data popup in DataUsage" into lmp-mr1-dev
2014-11-03 23:00:19 +00:00
Andrew Lee
8d4f7f94eb
Merge "Update class name for FdnList." into lmp-mr1-dev
2014-11-03 21:00:04 +00:00
Jason Monk
52f3f76855
am 7833aae7: am d5032cb5: am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
...
* commit '7833aae7822c2e636c50c3756b894ee86c1072b8':
Bring screen lock setting back to screen pinning
2014-11-03 14:55:12 +00:00
Jason Monk
8f5c0e4660
Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
2014-11-03 14:37:52 +00:00
PauloftheWest
3630f3f541
am 63fc10d7: am fb378106: am a7b5d2b3: Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
...
* commit '63fc10d7ca56962c5cb01df45ff8c0de98bb16a8':
Changed SIM calls to use PhoneAccount instead of SubInfoRecord.
2014-10-31 23:07:04 +00:00
Andrew Lee
da90d68b58
Update class name for FdnList.
...
Bug: 18114923
Change-Id: If32383b08e9a217d4f6b16208a74ca546572acc0
2014-10-31 13:21:57 -07:00