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

28844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
eb02435cbf Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev 2016-05-26 10:55:26 +00:00
Maurice Lam
b75baac925 Make fingerprint inherit from GLIF theme 
Set SuwThemeGlif.Light as the parent of fingerprint theme so that it
will inherit the margins and any other attributes.

There should be no visual change other than the fixed margins.

Bug: 28965312
Change-Id: I4e51c501c8ddb0e412e194e47bcee728da151ec5
 2016-05-26 00:22:36 +00:00
Maurice Lam
433671278f Merge "Update button styles in fingerprint setup" into nyc-mr1-dev 
am: 92d90a9df0

* commit '92d90a9df0c1c19a6682f105c3f48c4d0f8ac130':
  Update button styles in fingerprint setup

Change-Id: I4f825bf184213205d0a54fa9fe26274be1a31ede
 2016-05-26 00:09:05 +00:00
Android Build Merger (Role)
2a94bc34df Merge "Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6 am: 6193fb90ae" into nyc-mr1-dev-plus-aosp 2016-05-26 00:04:17 +00:00
Derek Tan
ba8680e7c6 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6 
am: 6193fb90ae

* commit '6193fb90ae7a83895f9af25b5928aadd1b8a8752':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: I8eef19e43551efc5685db02438590c576a28d73c
 2016-05-26 00:02:19 +00:00
Derek Tan
3f1ca3a975 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6 
am: a12ac3c683

* commit 'a12ac3c683e5bf675d844f5bde549b231353b0e8':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: I1ffe959d6279c1390f2d364ff5ceb8d46f0a295a
 2016-05-26 00:01:52 +00:00
Maurice Lam
92d90a9df0 Merge "Update button styles in fingerprint setup" into nyc-mr1-dev 2016-05-25 23:56:37 +00:00
Derek Tan
a12ac3c683 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev 
am: 08e24d43b6

* commit '08e24d43b6f1021b4eb6cd71543f16226d43bded':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: I21c3a65f2c6000ca207c0ca8bceb5316325c5e22
 2016-05-25 23:51:58 +00:00
Derek Tan
6193fb90ae Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev 
am: 08e24d43b6

* commit '08e24d43b6f1021b4eb6cd71543f16226d43bded':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: Ib804dcf00e5e183d3d9c02bc14513c98a7852ace
 2016-05-25 23:51:49 +00:00
Derek Tan
08e24d43b6 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev 2016-05-25 23:41:20 +00:00
Bill Yi
2515805c20 Import translations. DO NOT MERGE 
Change-Id: I587fce9e3728b76d7167c2049ecdd4c412e1d6e8
Auto-generated-cl: translation import
 2016-05-25 16:21:16 -07:00
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
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
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
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
Robin Lee
a6269236a2 Merge "Don't crash trying to disable lockdown VPN" into nyc-dev 2016-05-25 21:05:54 +00:00
Sudheer Shanka
1fa37f3bb3 Guard against IllegalArgumentException 
Bug: 28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
 2016-05-25 13:17:12 -07: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
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
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
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
Andrew Sapperstein
0c1d06e3a1 Merge "Fix confirm lock UI theme." into nyc-mr1-dev 2016-05-25 17:16:09 +00: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