Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,372 Commits 1 Branch 0 Tags
de4494dea4f7aa2ffc00c7fa9435a83cee85409e
Commit Graph

9301 Commits

Author SHA1 Message Date
Lucky Zhang
91527920ff [SetupWizard] Warn user of missing FRP if skipping wi-fi 
Change the skip string in wifi settings to warn user of missing
out on device protection.

Bug: 18391349
Change-Id: Ica2434589ece60205cd9a06088a8eb65d5edfd0d
 2014-11-21 18:37:00 +00:00
Zoltan Szatmary-Ban
9986ca49d6 am 3da30aab: am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 
* commit '3da30aabf18dcb0107894d7ef400f417cc665f5d':
  Remove backup preferences if backup service is inactive
 2014-11-21 15:37:25 +00:00
Zoltan Szatmary-Ban
61d0017cc1 am cf8255a0: am ad8191d9: am b85025d9: Strings for multiprofile Location Settings. 
* commit 'cf8255a0b150118a4c1f8703fe49d333d3fe0298':
  Strings for multiprofile Location Settings.
 2014-11-21 15:28:04 +00:00
Zoltan Szatmary-Ban
5875aefa8a Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 2014-11-21 15:21:34 +00:00
Zoltan Szatmary-Ban
b85025d98b Strings for multiprofile Location Settings. 
Bug: 17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3
 2014-11-21 15:10:23 +00:00
Jeff Davidson
f73f5b6d63 am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 
automerge: 32b7def

* commit '32b7def42f912ea527427892f4d95d277e4851fc':
  Final strings for Wi-Fi Assistant in platform settings.
 2014-11-21 01:55:01 +00:00
Zoltan Szatmary-Ban
2a7a9f6b9e am ead7991d: am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev automerge: 72b1985 
* commit 'ead7991dead5f2c5886778ac4d9b31f0ac300101':
  Show managed profile accounts on Settings > Factory Reset
 2014-11-20 21:29:12 +00:00
Zoltan Szatmary-Ban
876a21bae8 Remove backup preferences if backup service is inactive 
Also show informative message instead.

Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
 2014-11-20 20:20:49 +00:00
Jeff Davidson
101743f9ec Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 2014-11-20 18:37:53 +00:00
Zoltan Szatmary-Ban
548460bda5 Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 2014-11-20 14:06:14 +00:00
Sanket Padawe
d0c0a479b0 Changing hint string inside sim name editor dialog in settings. 
Chaning hint string from "Enter SSID" to "Enter SIM name" inside sim name
editor dialog in sim settings.

Bug: 18455476
Change-Id: I3ac58e23a23d6afa31b84ec1296623e0443f3cff
 2014-11-19 16:50:28 -08:00
Jeff Davidson
13b2a28463 Final strings for Wi-Fi Assistant in platform settings. 
Bug: 13780935
Change-Id: I70a22b3f439d05570d2508f8e05ed3aa9627e8f1
 2014-11-19 11:59:11 -08:00
Sanket Padawe
d1cb0d3805 am 1115d938: am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit '1115d93887de1b758fa120dc9a4caa7278dd4a96':
  Adding icons to sim color selection in settings UI.
 2014-11-18 20:17:51 +00:00
PauloftheWest
ed6cf9c191 am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
  Created Multi-SIM notifications.
 2014-11-18 20:17:50 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Sanket Padawe
a8bd025d35 Adding icons to sim color selection in settings UI. 
Adding icons to sim color selection of sim settings UI.

Bug: 18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
 2014-11-17 10:43:37 -08:00
Elliott Hughes
02c4c517df 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

(cherry picked from commit 30cc30864b)

Change-Id: I2a84d69a1f21f71d8bce5b69202b07f1b422aa57
 2014-11-17 10:43:20 -08:00
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
PauloftheWest
63f7bc87d8 Created Multi-SIM notifications. 
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is
added, removed, or replaced.
+ The notification informs the user there has been a change in SIMs and
they can tap the notification to go SIM Card Settings.

Bug: 18293625

Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
 2014-11-13 15:05:02 -08: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
Zoltan Szatmary-Ban
7cc1b9e63e Show managed profile accounts on Settings > Factory Reset 
List both primary profile's and managed profile's accounts. Also notify the user
if there are other users present on the device.

Bug: 17899181
Change-Id: I5401722e65305861edeed60cfe926fca5c81a418
 2014-11-12 01:18:29 +00: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