Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,604 Commits 1 Branch 0 Tags
71eb0ba809883ed7e43c00919fa0383510786f8c
Commit Graph

12558 Commits

Author SHA1 Message Date
Amit Mahajan
71eb0ba809 Merge "Fix ApnEditor UI -- specifically protocol and roamingProtocol summary" 2016-05-25 23:30:48 +00:00
Sunny Goyal
9588e9bd50 Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev am: 60a4dc652d 
am: a635c735ea

* commit 'a635c735eaba545ef428ff76d9d4a50303bb4331':
  Add an option allowing to skip wallpaper apps selection.

Change-Id: I8a2bae00cdf82dedacb492c6c0eee3f72251ac33
 2016-05-25 23:27:24 +00:00
Sudheer Shanka
14fd2ed541 Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34 am: 68a4e6c104 
am: 3958474fb3

* commit '3958474fb3c19c81e339feb86dd46d7fe9242ac4':
  Guard against IllegalArgumentException

Change-Id: I3247e2bd7cba49899e1db074037a8a29a231fa2d
 2016-05-25 23:27:21 +00:00
Sunny Goyal
a635c735ea Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev 
am: 60a4dc652d

* commit '60a4dc652db643d23417fb2f037369b15177b7e2':
  Add an option allowing to skip wallpaper apps selection.

Change-Id: I79a0ab340470a4a9e0489ddb86d217f7495284c1
 2016-05-25 23:18:33 +00:00
Sudheer Shanka
3958474fb3 Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34 
am: 68a4e6c104

* commit '68a4e6c104d08d4adadbec1077eadcf59629cec2':
  Guard against IllegalArgumentException

Change-Id: I894f473938f6b623791f412fe688e616b1bd9962
 2016-05-25 23:17:33 +00:00
Sudheer Shanka
68a4e6c104 Merge "Guard against IllegalArgumentException" into nyc-dev 
am: 96305a2b34

* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
  Guard against IllegalArgumentException

Change-Id: I8589c4c63d355d51ff0be27cd1ae6bd98eb2c0d9
 2016-05-25 23:10:43 +00:00
TreeHugger Robot
96305a2b34 Merge "Guard against IllegalArgumentException" into nyc-dev 2016-05-25 23:07:01 +00:00
TreeHugger Robot
56592b63c6 Merge "Disable FallbackHome on User 0 in split user system." 2016-05-25 22:52:49 +00:00
Sunny Goyal
60a4dc652d Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev 2016-05-25 22:50:43 +00:00
Sunny Goyal
d41d829dd5 Merge "Revert "Add an option allowing to skip wallpaper apps selection."" 2016-05-25 22:50:36 +00:00
Robin Lee
558123bc38 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: 74cc9772e9 
am: 2e98acf1ba

* commit '2e98acf1ba672ac766f9bc3cc555585aeaf7ea25':
  Don't crash trying to disable lockdown VPN

Change-Id: Ic1947363f51c9769415602752a650206a60b32a6
 2016-05-25 21:37:47 +00:00
Robin Lee
2e98acf1ba Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 
am: 74cc9772e9

* commit '74cc9772e9769b8c6a8cd6a6bb36cc8cfd5efb74':
  Don't crash trying to disable lockdown VPN

Change-Id: I8f69b83a4bf66b022f58d8deb9e70e911801b960
 2016-05-25 21:28:35 +00:00
Robin Lee
cb5c925432 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev 
am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: Ic83af8894c66947586d84ebdbfa667a6b1d2a93c
 2016-05-25 21:20:48 +00:00
Robin Lee
74cc9772e9 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev 
am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a
 2016-05-25 21:19:23 +00:00
Sunny Goyal
1598d73c12 Revert "Add an option allowing to skip wallpaper apps selection." 
This reverts commit fe4e80b98b.

This change is covered in https://googleplex-android-review.git.corp.google.com/#/c/1075489/

Change-Id: I4a9cf9f5199f315d2512ef211c8e617090acf244
 2016-05-25 21:08:47 +00:00
Robin Lee
a6269236a2 Merge "Don't crash trying to disable lockdown VPN" into nyc-dev 2016-05-25 21:05:54 +00:00
Muyuan Li
4811ab4b6d Disable FallbackHome on User 0 in split user system. 
Bug: 28870689
Change-Id: Ib0707cc31b1dd0851c918e4effe6d7a3798c801a
(cherry picked from commit 40066f7bfb4feb871d3db88e7575d67971257bea)
 2016-05-25 20:29:56 +00:00
Amit Mahajan
91fb480efa Fix ApnEditor UI -- specifically protocol and roamingProtocol summary 
Summary was being overwritten with the value for these fields.

Bug: 28962919
Change-Id: I563213b10253b1c519c31762186c922368d38ef9
 2016-05-25 20:26:13 +00:00
Sudheer Shanka
1fa37f3bb3 Guard against IllegalArgumentException 
Bug: 28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
 2016-05-25 13:17:12 -07:00
Daniel Nishi
33658f63af Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev am: 668c297603 
am: dd8ab483cb

* commit 'dd8ab483cbde1d701468c510d9df0de1d2496b84':
  Update the summary strings in the Deletion Helper to match the latest mocks.

Change-Id: I392115b87592bc314458120bedc2f712a37dd5fb
 2016-05-25 20:08:03 +00:00
Daniel Nishi
b058ba1eb1 Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev am: 4c5e2bb526 
am: 606f1fc7cc

* commit '606f1fc7cca3b61a9bdc04b6aecf56c00b74c01c':
  Hook up the automatic storage manager settings with the flag.

Change-Id: I244abd674cbc632607357f7c2b319752e2db6b00
 2016-05-25 20:08:02 +00:00
Daniel Nishi
dd8ab483cb Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev 
am: 668c297603

* commit '668c297603c6ae20225717741d90d06e819216c0':
  Update the summary strings in the Deletion Helper to match the latest mocks.

Change-Id: I9936874c26db790379b6b5781547182c21e74470
 2016-05-25 20:04:06 +00:00
Daniel Nishi
606f1fc7cc Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev 
am: 4c5e2bb526

* commit '4c5e2bb526d93e3e5a3958f44a4fe2d012a6ffe7':
  Hook up the automatic storage manager settings with the flag.

Change-Id: Ia3be5191adf3eee5fcf407ced923c94435e9da73
 2016-05-25 20:04:05 +00:00
Daniel Nishi
668c297603 Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev 2016-05-25 20:02:25 +00:00
Andrew Sapperstein
a2f67f1fbe Merge "More theming fixes." into nyc-mr1-dev am: 9341ac980e 
am: 4a8586cfe6

* commit '4a8586cfe6fa8ab72868fb55640c8e42b8c2d0fe':
  More theming fixes.

Change-Id: I245852591812d5beaaab15011e0ad4301ffe2947
 2016-05-25 20:00:06 +00:00
Daniel Nishi
4c5e2bb526 Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev 2016-05-25 19:55:58 +00:00
Andrew Sapperstein
4a8586cfe6 Merge "More theming fixes." into nyc-mr1-dev 
am: 9341ac980e

* commit '9341ac980e29e6a692c4c3a61096fabbd35c9902':
  More theming fixes.

Change-Id: Id18687881ca1529f10266c58dbc8f16a42b62c33
 2016-05-25 19:54:34 +00:00
Sunny Goyal
21ef89fd6b Add an option allowing to skip wallpaper apps selection. 
This commit adds an option to the Settings application, making it
possible to launch a different activity for wallpaper selection

Also removing te intent constant android.settings.WALLPAPER_SETTINGS
The target for this action can't be easily overriden when the
wallpaper target is overriden, which would provide an inconsistant
experience.

Bug: 28554244
Bug: 26688904
Change-Id: I25367fbb4505615351fbad9e1aa1ca88df0cd034
 2016-05-25 12:46:43 -07:00
Andrew Sapperstein
9341ac980e Merge "More theming fixes." into nyc-mr1-dev 2016-05-25 19:40:50 +00:00
Jeff Sharkey
5982ed4529 Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e am: 4061fd1ddd 
am: 1750e4abec

* commit '1750e4abeceb28e7ad6de313aea7007d27dcdece':
  Skip indexing content while user is locked.

Change-Id: I4e21ab2ede02223f76728dc89a0a2af2ff564dcb
 2016-05-25 19:05:20 +00:00
Jason Monk
0fb88a1eb7 Don\'t update conditions on background threads am: 6cb280d146 am: 928dbe3462 
am: 95fb0ae886

* commit '95fb0ae886d8752f2d83d711a2b06c0ab1b2f33e':
  Don't update conditions on background threads

Change-Id: I35e155088e6d9eae76aa29970dfc2d05744fd053
 2016-05-25 19:05:14 +00:00
Jeff Sharkey
1750e4abec Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e 
am: 4061fd1ddd

* commit '4061fd1ddd10cb689ae40ef62dd2544093f264fa':
  Skip indexing content while user is locked.

Change-Id: I3a6889d91de679709918a3a9367e8e4054a809a9
 2016-05-25 18:42:42 +00:00
Jeff Sharkey
a592e55e5f Merge "Skip indexing content while user is locked." into nyc-dev 
am: c416433a9e

* commit 'c416433a9ee55e2ac44fdb8e6c6d6ca4ed4cde62':
  Skip indexing content while user is locked.

Change-Id: I6ab94e16a26186490ce4f43bca4a96445e114b36
 2016-05-25 18:42:40 +00:00
Jason Monk
95fb0ae886 Don\'t update conditions on background threads am: 6cb280d146 
am: 928dbe3462

* commit '928dbe3462fd63cc60bda0ee3482320fc3c1a855':
  Don't update conditions on background threads

Change-Id: I8d1c52938f77a9574a8f903d671117ac64ac1e9e
 2016-05-25 18:42:39 +00:00
Jason Monk
25f821c3c2 Don\'t update conditions on background threads 
am: 6cb280d146

* commit '6cb280d14641327b32378504544d125bbc3bcaf3':
  Don't update conditions on background threads

Change-Id: I617f17f7e4839566bd6996a31c0d4b6bdfc0b8e4
 2016-05-25 18:42:38 +00:00
Jeff Sharkey
4061fd1ddd Merge "Skip indexing content while user is locked." into nyc-dev 
am: c416433a9e

* commit 'c416433a9ee55e2ac44fdb8e6c6d6ca4ed4cde62':
  Skip indexing content while user is locked.

Change-Id: I749bebca289615b2a68fb87e463cadee4fb8840e
 2016-05-25 18:30:30 +00:00
Jason Monk
928dbe3462 Don\'t update conditions on background threads 
am: 6cb280d146

* commit '6cb280d14641327b32378504544d125bbc3bcaf3':
  Don't update conditions on background threads

Change-Id: I446e85dc5462e3c06a75e2e53f1990990bb06f48
 2016-05-25 18:28:02 +00:00
TreeHugger Robot
c416433a9e Merge "Skip indexing content while user is locked." into nyc-dev 2016-05-25 18:27:29 +00:00
Daniel Nishi
84d944b0bc Update the summary strings in the Deletion Helper to match the latest mocks. 
Bug: 28917902
Change-Id: I35af7483f2a97dffc230093a90f0b7d87a4532c1
 2016-05-25 11:11:03 -07:00
Andrew Sapperstein
7232e4f7ee More theming fixes. 
Updated the importance seekbar to use colorAccent instead of a hardcoded
color.

Refactored the various gear icons to all use ic_settings (a rename of
ic_bt_config). Deleted the png version (ic_sysbar_quicksettings).

Cleaned up the add icon. Now there are two vector drawables (one white,
one tinted with the accent color). Deleted the existing pngs and updated
the usages to use one of the two vector drawables. Deleted the theme
attr for ic_menu_add that had no usages.

BUG: 28760785

Change-Id: Icd5561d5b3f5ddee8aab78a3da7daa2dca0e30e3
 2016-05-25 10:55:11 -07:00
Daniel Nishi
ed39bf639b Hook up the automatic storage manager settings with the flag. 
This allows the settings menu to actually toggle the feature on
and off.

Bug: 28905328
Change-Id: I132c0930970b70a0f88b8fc21e85b6829aaef8c8
 2016-05-25 10:03:17 -07:00
Jason Monk
6cb280d146 Don't update conditions on background threads 
Instead build a list and set it on the main thread to avoid
concurrent modification crashes.

Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes: 28794277
 2016-05-25 12:53:34 -04:00
Jeff Sharkey
c4eac99223 Skip indexing content while user is locked. 
Otherwise we try touching printing services which throw.

Bug: 28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad
 2016-05-25 10:52:34 -06:00
Ricky Wai
951ba73208 Hide work profile key in user credentials screen am: 9579274cda am: 7a2eb4d3a9 
am: 202b037524

* commit '202b037524ec3ac2c0e8c343a20bfb82555537b6':
  Hide work profile key in user credentials screen

Change-Id: Iac7d8c6a1d2334293c014b669e03425e9b470fd6
 2016-05-25 13:35:00 +00:00
Ricky Wai
202b037524 Hide work profile key in user credentials screen am: 9579274cda 
am: 7a2eb4d3a9

* commit '7a2eb4d3a9717f85e423b3ec1d83cb664a23705b':
  Hide work profile key in user credentials screen

Change-Id: I96b71597af058a20b462900cb9f4b73c80d68dda
 2016-05-25 13:27:51 +00:00
Ricky Wai
7a2eb4d3a9 Hide work profile key in user credentials screen 
am: 9579274cda

* commit '9579274cda38c552b43febe0980f0ec6bd07277d':
  Hide work profile key in user credentials screen

Change-Id: I1db0e7538f4e6e8cfddac9a4f94ee2d050c4d433
 2016-05-25 13:21:01 +00:00
Ricky Wai
3652f20efb Hide work profile key in user credentials screen 
am: 9579274cda

* commit '9579274cda38c552b43febe0980f0ec6bd07277d':
  Hide work profile key in user credentials screen

Change-Id: I1b0b50a5ff0cc8dd0bef132ac63790c677bba188
 2016-05-25 13:18:43 +00:00
Ricky Wai
9579274cda Hide work profile key in user credentials screen 
Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
 2016-05-25 13:11:24 +00:00
Andrew Sapperstein
e296af90f0 Update color bar defaults to use theme attr colors am: b40b0d2006 
am: d6d7eaf95f

* commit 'd6d7eaf95f816a22fa42d500995d1092c61a8f8b':
  Update color bar defaults to use theme attr colors

Change-Id: I5a8771573d211215b57be27fa52e9d880e1e1c78
 2016-05-25 03:48:35 +00:00
Andrew Sapperstein
d6d7eaf95f Update color bar defaults to use theme attr colors 
am: b40b0d2006

* commit 'b40b0d20066aeb53ae69e57979a92c337d0100df':
  Update color bar defaults to use theme attr colors

Change-Id: I6e2fc7d85f6b895a2ee3dfbc0912e0f1adb2dd98
 2016-05-25 03:45:41 +00:00