Commit Graph

2431 Commits

Author SHA1 Message Date
Elliott Hughes
150b646833 am ba586392: am 3dd51556: Merge "Remove vestigial "Choose date format" option."
* commit 'ba5863929a5679b14e8dcc70c9d6f777a675459a':
  Remove vestigial "Choose date format" option.
2014-11-17 17:44:24 +00:00
Elliott Hughes
ba5863929a am 3dd51556: Merge "Remove vestigial "Choose date format" option."
* commit '3dd51556bcbf7addcc17d29dd360165ee7ede1ee':
  Remove vestigial "Choose date format" option.
2014-11-17 17:37:35 +00:00
Paul Crowley
b674ebbca6 am e722c375: am 807386b7: am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev
* commit 'e722c375df0155c581cb3eb79f4fcc5f8891d738':
  Force power cycle on cooldown.
2014-11-17 13:42:16 +00:00
Paul Crowley
bf88566dc7 Merge "Force power cycle on cooldown." into lmp-mr1-dev 2014-11-17 13:29:50 +00:00
Jeff Davidson
a1aba5484b am 13259fd3: am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev automerge: 0ae8d5c
* commit '13259fd3a1666018328a45095cca5918a7c297d0':
  Final UX for Wi-Fi assistant platform settings.
2014-11-15 03:09:14 +00:00
Jeff Davidson
ce32b21727 Final UX for Wi-Fi assistant platform settings.
When one app is available, the toggle works as before. When multiple
apps are available, we allow the user to choose the app in a dialog
before turning on the setting.

Bug: 13780935
Change-Id: I1c4391bf97a53febe580fb2b896b4850372062e7
2014-11-14 15:27:21 -08:00
Elliott Hughes
30cc30864b Remove vestigial "Choose date format" option.
Almost all of our date formatting goes via icu these days, so this is
a no-op almost everywhere. (And should be a no-op everywhere soon.)
There's no obvious way to fix it, so remove it. UI guidelines say we
should use spelled out month names anyway.

Bug: 18322220
Change-Id: Ic9e903eceab3c096426f313bf4ef3a38644774e1
2014-11-14 11:16:16 -08:00
PauloftheWest
3dc6c4e6f3 am f95f2590: am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev
* commit 'f95f2590c1ea6023c9c88d6fb031d622a609df2a':
  Adding Sim Status menu to Settings.
2014-11-14 00:43:19 +00:00
Paul Crowley
51e0811a7a Force power cycle on cooldown.
Bug: 18292029
Change-Id: I02b6eff56902859ae3aba4909656553f4b322b0c
2014-11-13 14:52:19 +00:00
PauloftheWest
76b0801173 Adding Sim Status menu to Settings.
+ Added tabs for Multi-SIM devices.
+ Most of the code was taken from MediaTek
(https://partner-android-review.googlesource.com/#/c/181417)

Bug: 18195254
Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
2014-11-12 14:52:18 -08:00
John Spurlock
5f0d6e2b77 am 32830286: am 0193911e: Settings: Tweak doze settings description. automerge: 9259316
* commit '32830286e83f26af871785741a65d18c0c5f5058':
  Settings: Tweak doze settings description.
2014-11-11 18:55:37 +00:00
John Spurlock
0193911ea5 Settings: Tweak doze settings description.
Change-Id: If9241fabf8e097ef57049cfb2c7f75513f978759
2014-11-11 13:07:09 -05:00
John Spurlock
db73eae8d9 am 1f382c6a: Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b automerge: 28c275e
* commit '1f382c6a4fece4de542996adb27054088784503c':
  Settings: Update preference summary per new downtime behavior.
2014-11-11 02:50:24 +00:00
John Spurlock
49300d19ab Settings: Update preference summary per new downtime behavior.
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
2014-11-10 14:49:10 -05:00
Fabrice Di Meglio
1515051537 am 8a343c44: am 3c05c164: am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev
* commit '8a343c44215db5d8099ab0ace8b5a4a123ce62e8':
  Fix bug #18289076 Storage graph colors don't match Material design spec
2014-11-07 23:22:00 +00:00
Fabrice Di Meglio
d9966523f0 Merge "Fix bug #18289076 Storage graph colors don't match Material design spec" into lmp-mr1-dev 2014-11-07 23:07:05 +00:00
Fabrice Di Meglio
e7ed65602b Fix bug #18289076 Storage graph colors don't match Material design spec
- update colors per UX request for matching Material Design colors spec

Change-Id: Ibee52ee0edef2d678d86e3960cd7ff058476a25e
2014-11-07 14:46:20 -08:00
Jason Monk
cbf1d5d0dc am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev
automerge: 0ae5f60

* commit '0ae5f6037b68794dc8a394c24a6ec8413c97555f':
  Screen pinning: fix strings and add scrollview
2014-11-07 17:18:40 +00:00
Jason Monk
cc0a2c554a Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 2014-11-07 16:58:37 +00:00
Jason Monk
d570e9839e Screen pinning: fix strings and add scrollview
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.

Bug: 18287056
Bug: 17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
2014-11-07 11:46:33 -05:00
Alexandra Gherghina
eb320d2bad am 6f8019d8: am fcb880c6: am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
* commit '6f8019d8891095cce375ce7f7ebbf3ad8ba6d57c':
  Update text for apps installed for other users
2014-11-07 10:48:43 +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
d103e453c6 am 981ab4b2: am a581a16d: am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
* commit '981ab4b2f194c52f4401b3c6e55fb9549204e051':
  Update synonyms and fix some issues related to them
2014-11-07 04:17:46 +00:00
Paul Crowley
a03cd588d2 am 0844554f: am 83b4fac5: am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev
* commit '0844554f82b0db64cb2eeb8f0aac681edb7ad6f6':
  Add a new flow for decryption checking.
2014-11-07 04:15:35 +00:00
Jeff Davidson
568d156089 am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card.
* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
  Remove the Wi-Fi Assistant card.
2014-11-07 04:12:59 +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
41c1977978 Merge "Add a new flow for decryption checking." into lmp-mr1-dev 2014-11-07 00:26:45 +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
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
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
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
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
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
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
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