PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,708 Commits 1 Branch 0 Tags
b0e3a1925ad9c9f896cbcd61787073555ba0bafc
Commit Graph

28708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sudheer Shanka
b1a7ba74bb Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34 
am: 319961f7c4

* commit '319961f7c4910bd3942fc52b4911a7274939c7fc':

Change-Id: If4f198eeb3e61d3e5cd97f74707350d2cfe091be
 2016-05-25 23:18:37 +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
Sudheer Shanka
319961f7c4 Merge "Guard against IllegalArgumentException" into nyc-dev 
am: 96305a2b34

* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
  Guard against IllegalArgumentException

Change-Id: I03ad7e1ed4fe1c2ebd65ab822364566eba1d5b34
 2016-05-25 23:10:43 +00:00
Bill Yi
5b8dafec31 Import translations. DO NOT MERGE 
Change-Id: I62ad1f9b258253eda03814f9a7bd93986c85f902
Auto-generated-cl: translation import
 2016-05-25 16:07:25 -07: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
Maurice Lam
558c82ffd8 Update button styles in fingerprint setup 
Bug: 28888250
Change-Id: I2f9e7b4c886f27deac6b42860452a3fa0006facd
 2016-05-25 15:25:13 -07:00
Derek Tan
d1151c19d8 Use getConfigForSubId instead of getConfig(int). 
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
 2016-05-25 15:00:27 -07:00
Robin Lee
33a72635a6 Merge "Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: cb5c925432" into nyc-mr1-dev-plus-aosp 
am: d34faeaded

* commit 'd34faeaded2705b3cd70ef9b30b93aba2dea3a94':

Change-Id: I8810a87d00bd90d505a5daa658ed674182bdb108
 2016-05-25 21:38:38 +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
Android Build Merger (Role)
d34faeaded Merge "Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: cb5c925432" into nyc-mr1-dev-plus-aosp 2016-05-25 21:29:56 +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
95c10c536b Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 
am: cb5c925432

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

Change-Id: I80f61b1a95d44f0be18577f37a709e4d15196d04
 2016-05-25 21:28:34 +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
e318e0ff47 Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e am: a592e55e5f 
am: e06f74af73

* commit 'e06f74af73942d04911a14331993fcea99164e1a':

Change-Id: Id1a7d07db963746fbd4cf1a67ff6c6b9528d51a2
 2016-05-25 19:05:28 +00:00
Jason Monk
a9480bc114 Don\'t update conditions on background threads am: 6cb280d146 am: 25f821c3c2 
am: 11afb18c3d

* commit '11afb18c3de01b10a64555b4c10529d9b10842f8':

Change-Id: I8e3ecb0d50bc2e6c6a5aaf502f828c2afeb53e8d
 2016-05-25 19:05:25 +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
Andrew Sapperstein
d100ecf993 Merge "Fix confirm lock UI theme." into nyc-mr1-dev am: 0c1d06e3a1 
am: 96bec70cb3

* commit '96bec70cb31d0f90620f0589634061a8591b1bbf':
  Fix confirm lock UI theme.

Change-Id: I4133af7020ab30cdbfd16c165af6d1d8871e0b26
 2016-05-25 19:05:07 +00:00
Jeff Sharkey
e06f74af73 Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e 
am: a592e55e5f

* commit 'a592e55e5ff8e7b4e799745f076888e6bbbcdf55':

Change-Id: Ie64ecbe217deec122560d62b94816c92e5970301
 2016-05-25 18:58:20 +00:00
Jason Monk
11afb18c3d Don\'t update conditions on background threads am: 6cb280d146 
am: 25f821c3c2

* commit '25f821c3c2e37522584dc2516a341d2dc9a210cd':

Change-Id: I591541f8458fdb5e5022a53e08fa911b4fd2021c
 2016-05-25 18:58:19 +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
Andrew Sapperstein
96bec70cb3 Merge "Fix confirm lock UI theme." into nyc-mr1-dev 
am: 0c1d06e3a1

* commit '0c1d06e3a1aed3d66058b6e4f5d9c2e91ffd9220':
  Fix confirm lock UI theme.

Change-Id: I1ba27c48549cdfbeca72572ad5118690f05061eb
 2016-05-25 18:42:35 +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