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
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
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
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
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
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
2016-05-25 21:19:23 +00:00
Sunny Goyal
1598d73c12
Revert "Add an option allowing to skip wallpaper apps selection."
...
This reverts commit fe4e80b98bhttps://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
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
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
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
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
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
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
2016-05-25 19:05:28 +00:00
Jason Monk
a9480bc114
Don\'t update conditions on background threads am: 6cb280d146 am: 25f821c3c2
...
am: 11afb18c3d
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
2016-05-25 19:05:20 +00:00
Jason Monk
0fb88a1eb7
Don\'t update conditions on background threads am: 6cb280d146 am: 928dbe3462
...
am: 95fb0ae886
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
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
2016-05-25 18:58:20 +00:00
Jason Monk
11afb18c3d
Don\'t update conditions on background threads am: 6cb280d146
...
am: 25f821c3c2
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
2016-05-25 18:42:42 +00:00
Jeff Sharkey
a592e55e5f
Merge "Skip indexing content while user is locked." into nyc-dev
...
am: c416433a9e
2016-05-25 18:42:40 +00:00
Jason Monk
95fb0ae886
Don\'t update conditions on background threads am: 6cb280d146
...
am: 928dbe3462
2016-05-25 18:42:39 +00:00
Jason Monk
25f821c3c2
Don\'t update conditions on background threads
...
am: 6cb280d146
2016-05-25 18:42:38 +00:00
Andrew Sapperstein
96bec70cb3
Merge "Fix confirm lock UI theme." into nyc-mr1-dev
...
am: 0c1d06e3a1
2016-05-25 18:42:35 +00:00
Jeff Sharkey
4061fd1ddd
Merge "Skip indexing content while user is locked." into nyc-dev
...
am: c416433a9e
2016-05-25 18:30:30 +00:00
Jason Monk
928dbe3462
Don\'t update conditions on background threads
...
am: 6cb280d146
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
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
