PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,849 Commits 1 Branch 0 Tags
dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c
Commit Graph

5703 Commits

Author SHA1 Message Date
John Spurlock
28c275ed70 Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev 
automerge: 64cb79b

* commit '64cb79bb6982ebe2907daed761d829dea4fef081':
  Settings: Update preference summary per new downtime behavior.
 2014-11-11 02:33:20 +00:00
John Spurlock
64cb79bb69 Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev 2014-11-11 02:22:19 +00:00
Geoff Mendal
fa0ed7a83f Import translations. DO NOT MERGE 
Change-Id: I239d9e96f7a88bb558ec2f14955ae98af32fab23
Auto-generated-cl: translation import
 2014-11-10 14:17:52 -08:00
Geoff Mendal
c0c56cad2b Import translations. DO NOT MERGE 
Change-Id: I89de05dbac32f4acf541a4a2d6cb3225652fd39b
Auto-generated-cl: translation import
 2014-11-10 14:12:28 -08: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
8a343c4421 am 3c05c164: am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit '3c05c164bfb640990102734e73884252b803abe8':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:18:02 +00:00
Fabrice Di Meglio
3c05c164bf am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit 'd9966523f0c5dc3c3a68c5e0ecfb1a0b1f2bca70':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:12:30 +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
0ae5f6037b am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'dac36fafbe5757bdfc44d50e93c4e2771fbc71e0':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:07:02 +00:00
Jason Monk
dac36fafbe am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'cc0a2c554a8a576df2dbf4f564970cd67cd34e77':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:02:03 +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
Baligh Uddin
449dc733e3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:03:15 +00:00
Baligh Uddin
5fbfdc83e4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:03:01 +00:00
Alexandra Gherghina
6f8019d889 am fcb880c6: am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev 
* commit 'fcb880c6d1cbe23bcfcbd92f1b6cdc3c88892e39':
  Update text for apps installed for other users
 2014-11-07 10:44:51 +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
981ab4b2f1 am a581a16d: am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit 'a581a16dcd7bd02260ce4e3c1e8635478a817bc1':
  Update synonyms and fix some issues related to them
 2014-11-07 01:55:39 +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
0844554f82 am 83b4fac5: am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev 
* commit '83b4fac50a198187f410e2b4e8694c22db173d45':
  Add a new flow for decryption checking.
 2014-11-07 00:40:47 +00: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
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
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

* commit 'b46a9194fe88a26e80d415919d191703c340925e':
  Show accurate connection status for ephemeral networks.
 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
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

* commit '92f02463fcea8e428b3be028082e8895ac8c5708':
  Settings: Allow user to configure "None" for downtime.
 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
7d3e182c18 Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9 
automerge: eb55ac9

* commit 'eb55ac90dd8034a64ac146c4f4829b1e8bab1d17':
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock
 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

* commit '966a1cadbf83412384261d1eea1192150e5fd1a8':
  Don't show a pattern-specific prompt at encryption time.
 2014-11-05 18:05:05 +00:00
Andres Morales
eb55ac90dd Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev 
automerge: ea4d9a9

* commit 'ea4d9a9eca7e18d35e521d80d57628f5a7347e55':
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock
 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

* commit 'e6ad7bf05263941ea89b8dda7cded6f9d434a6da':
  Don't show a pattern-specific prompt at encryption time.
 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
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