Baligh Uddin
5fbfdc83e4
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-07 15:03:01 +00:00
Alexandra Gherghina
fcb880c6d1
am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
...
* commit 'ee70c69919d3e49ba76d2710850fd70be5c09998':
Update text for apps installed for other users
2014-11-07 10:39:42 +00:00
Alexandra Gherghina
ee70c69919
Merge "Update text for apps installed for other users" into lmp-mr1-dev
2014-11-07 10:35:38 +00:00
Alexandra Gherghina
d9ed84375d
Update text for apps installed for other users
...
This also refactors the layout to accommodate longer text
Bug: 16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
2014-11-07 10:05:49 +00:00
Fabrice Di Meglio
a581a16dcd
am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
...
* commit 'fff7e020e83b1f23de11a842c56728f8a739a8d1':
Update synonyms and fix some issues related to them
2014-11-07 01:46:20 +00:00
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
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
83b4fac50a
am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev
...
* commit '41c197797832efd2acee013c0079fe7850559795':
Add a new flow for decryption checking.
2014-11-07 00:33:42 +00:00
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
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
03fb1255ce
Import translations. DO NOT MERGE
...
Change-Id: I3b866f948797d2f710f53ce51aaa54b373a346e0
Auto-generated-cl: translation import
2014-11-06 09:42:35 -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
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
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
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
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
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
Andres Morales
73bbd4cbff
Request PIN confirmation to enable OEM unlock
...
Bug: 18191568
Change-Id: I1cfce5131c96711876953a28d8d642342d15201e
2014-11-03 17:02:11 -08: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
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
Geoff Mendal
e15da20061
Import translations. DO NOT MERGE
...
Change-Id: I6ec1f3604264e67b37956a3e6f0960ddfc0f8ee7
Auto-generated-cl: translation import
2014-11-03 09:58:33 -08:00
Jason Monk
d5032cb5e6
am 8f5c0e46: Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev
...
* commit '8f5c0e4660629546fb651e8bc739677a60ad3302':
Bring screen lock setting back to screen pinning
2014-11-03 14:45:21 +00:00
Jason Monk
78121d9d10
Bring screen lock setting back to screen pinning
...
The material design of the request has removed this option from
the dialog, and now needs to be in settings. When screen
pinning is off it shows a description of how to use the feature,
however when on it shows a switch to control whether it locks
the device on exit. This setting defaults to on if there is a
lock pin/pattern.
Bug: 16957435
Change-Id: I59e0d64964cee4302e6ecff59e622cfe11422807
2014-10-31 15:45:12 -04:00
Alexandra Gherghina
0f5440f6e2
Apply predefined icon and label to managed profiles
...
Bug: 18132630
Change-Id: Ie6cfee420847d6992accb0bc0ca3f5535260bc55
2014-10-31 12:03:53 +00:00
PauloftheWest
de33844d81
Added cellular data popup in DataUsage
...
+ If the user attempts to enable data usage on a SIM that is not the
default, the system will confirm that the user wants data to go through
the new SIM.
Change-Id: Ia1652a30a3641bb29eadad20b2dc61321227a961
2014-10-30 13:56:23 -07:00
Geoff Mendal
d4aa6dd89d
Import translations. DO NOT MERGE
...
Change-Id: I79579c3aa684edf09b0bc85941dea8a70a4c12fc
Auto-generated-cl: translation import
2014-10-29 13:31:24 -07:00
Geoff Mendal
15d1b346cf
Import translations. DO NOT MERGE
...
Change-Id: I2b2810ffec88c69ab46b6672df00d381ce2429b2
Auto-generated-cl: translation import
2014-10-29 13:28:44 -07:00
Sanket Padawe
4a1c5486b8
am 917aaf9e: Merge "Add sim color selection in settings" into lmp-mr1-dev
...
* commit '917aaf9ebd2893b9d0cebc2b08c4f7d814fa53c7':
Add sim color selection in settings
2014-10-28 22:53:07 +00:00
Sanket Padawe
917aaf9ebd
Merge "Add sim color selection in settings" into lmp-mr1-dev
2014-10-28 22:48:33 +00:00
PauloftheWest
22f257b091
am 93c10334: Merge "Added IMEI status activity." into lmp-mr1-dev
...
* commit '93c10334c8380b997554a02f6071b3bc620e7705':
Added IMEI status activity.
2014-10-28 22:48:29 +00:00
PauloftheWest
93c10334c8
Merge "Added IMEI status activity." into lmp-mr1-dev
2014-10-28 22:45:34 +00:00
Sanket Padawe
abc505aac3
Add sim color selection in settings
...
Adding a dropdown list to select sim color from sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
2014-10-28 14:01:50 -07:00
Paul Lawrence
be49264410
am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev
...
* commit '00abeba2c08b656db924d967a0733aa76aea40a7':
Make emergency button right size
2014-10-28 20:14:31 +00:00
