Commit Graph

27607 Commits

Author SHA1 Message Date
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
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
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
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
Android Build Merger (Role)
398c290607 Merge "Hide work profile key in user credentials screen am: 9579274cda am: 3652f20efb" into nyc-mr1-dev-plus-aosp 2016-05-25 13:29:32 +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
82ca2e6e21 Hide work profile key in user credentials screen am: 9579274cda
am: 3652f20efb

* commit '3652f20efbee984906502b15b4ac7ad76039ecb2':
  Hide work profile key in user credentials screen

Change-Id: I8c5325f10fd5d5adfed1e09142096ff850ad2636
2016-05-25 13:27:42 +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
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
Andrew Sapperstein
1883bc5c3c Update Theme.DialogWhenLarge to use theme colors.
am: ddc21c0fb1

* commit 'ddc21c0fb19b0ec2365ac650e833f1980b0f35b2':
  Update Theme.DialogWhenLarge to use theme colors.

Change-Id: Id4ca795b39edef90119d46ebe3f4b6f4bb93f29b
2016-05-25 03:45:41 +00:00
Andrew Sapperstein
542c63384c Update alertDialogTheme to use proper colorAccent.
am: 8da144bdee

* commit '8da144bdee8d6fcf90a5b42e2e726a5a3d05c82d':
  Update alertDialogTheme to use proper colorAccent.

Change-Id: I8e7790a5c7293bf81881ed5e14335e0840bedba6
2016-05-25 03:45:40 +00:00
Andrew Sapperstein
0067760b50 Fix confirm lock UI theme.
Now uses colorPrimary as its background color and sets colorAccent
directly. Some other mild cleanup as well.

BUG: 28760785

Change-Id: Ib8e5140b789449e518b498bc49438cb4a2bc6451
2016-05-24 18:08:36 -07:00
Andrew Sapperstein
b40b0d2006 Update color bar defaults to use theme attr colors
Previously the values were hardcoded. Now the default value
for left and middle are colorAccent. Also updated SummaryPreference
to not call LinearColorBar.setColors unless its own setColors is called.

BUG: 28760785

Change-Id: Id28e809e6b5f0f6508258c995d5dcfacbc9c8725
2016-05-24 18:08:36 -07:00
Andrew Sapperstein
ddc21c0fb1 Update Theme.DialogWhenLarge to use theme colors.
This theme is at least used by the Phone Status activity and probably
others as well.

BUG: 28760785

Change-Id: If3faa84ad9d291f007c7191f1c0dba8d98fe9bf8
2016-05-24 18:08:36 -07:00
Andrew Sapperstein
8da144bdee Update alertDialogTheme to use proper colorAccent.
The settings dialogs were all using the default colorAccent.
Now it uses the app's version.

BUG: 28760785

Change-Id: Ic9bf90745db7d2ef5b1fd047474bab5c6bbdab23
2016-05-24 18:08:36 -07:00
Adrian Roos
aa98d45059 Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
am: 4b3ab5871c

* commit '4b3ab5871c0869eb0f51a08a6bc9aceede856090':

Change-Id: I2488f70caa3b2a735d02b16decba07d25a6af272
2016-05-25 00:35:41 +00:00
Adrian Roos
7226630b67 Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
am: aea945a821

* commit 'aea945a82133cfc2704c14b214fd93e06624f4f3':
  Remove option to configure emergency app

Change-Id: I6fd3b85f96e22fb85960fcad56e09b8f8b0eef70
2016-05-25 00:31:58 +00:00
Adrian Roos
aea945a821 Merge "Remove option to configure emergency app" into nyc-dev
am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: I4643f4cae85c6e70d82a8a25f34c2f17305b240d
2016-05-25 00:23:29 +00:00
Adrian Roos
4b3ab5871c Merge "Remove option to configure emergency app" into nyc-dev
am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe
2016-05-25 00:23:28 +00:00
TreeHugger Robot
06b7d7cdf9 Merge "Remove option to configure emergency app" into nyc-dev 2016-05-25 00:17:20 +00:00
Andrew Sapperstein
cd7376067c Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev
am: 759ba9d152

* commit '759ba9d152296470fa8d4153726cf8a08e4bf51d':
  Replace bluetooth pngs with vector drawables.

Change-Id: I6c251e7207469ccbc6a147617aeed4af38138dcb
2016-05-25 00:09:08 +00:00
TreeHugger Robot
759ba9d152 Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev 2016-05-24 23:50:30 +00:00
Daniel Nishi
5a546fbcaf Change Downloads to show individual files in the Deletion Helper.
am: 1370f7ed20

* commit '1370f7ed200ae4442c1d4a159584c26bc86d8a63':
  Change Downloads to show individual files in the Deletion Helper.

Change-Id: I52237038b49acdd1122c4ade19e408463027b0bb
2016-05-24 23:05:11 +00:00
Andrew Sapperstein
aeed7d481c Replace bluetooth pngs with vector drawables.
The current pngs are hardcoded to the green accent color.
Instead, the new vector drawable replacements have colorAccent
set as a tint.

BUG: 28760785
Change-Id: I01853d4e93bca6651460ad86505d0943dc68bf93
2016-05-24 15:32:12 -07:00
Daniel Nishi
ce584ff754 Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev
am: 97ac5c773d

* commit '97ac5c773da07d637ef0e92edbde4052714683ab':
  Update the storage manager settings to match the mocks.

Change-Id: I9c6ed838d3f58fb97c93779c9378f59bb88b1b66
2016-05-24 21:32:37 +00:00
Daniel Nishi
1370f7ed20 Change Downloads to show individual files in the Deletion Helper.
The first implementation simply had every file in the Downloads folder
be under a single checkbox. This iteration makes Downloads an
expandable dropdown preference listing every single file individually
for selection to be deleted.

Bug: 28621781
Change-Id: I5169caf718cee4c0fa7f0248bc4c443984766005
2016-05-24 14:26:38 -07:00
Andrew Sapperstein
38972c3809 Merge "Refactor Settings theme colors." into nyc-mr1-dev
am: 076731b825

* commit '076731b8258bb9ed40cfef55c77c69f71fc86331':
  Refactor Settings theme colors.

Change-Id: I520678bf558b33476b705fb7d48a54ecd9b1b5fc
2016-05-24 21:25:50 +00:00
Daniel Nishi
97ac5c773d Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev 2016-05-24 21:18:39 +00:00
TreeHugger Robot
076731b825 Merge "Refactor Settings theme colors." into nyc-mr1-dev 2016-05-24 21:13:24 +00:00
Andrew Sapperstein
8dd11327b6 Refactor Settings theme colors.
Introduces stock colors (primary_color, primary_dark_color, etc) to allow
overriding the colors via resource overlays.

Creates new colorSecondary attribute and updates switches to use theme
attributes for foreground/background colors rather than hardcoded values.

Some other mild color cleanup to make things more straightforward.

BUG: 28760785
Change-Id: I4deba962357217bdb2e08c08e8f83b9b57a683d4
2016-05-24 12:49:17 -07:00
Daniel Nishi
11b6563cb6 Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev
am: c05c8617bc

* commit 'c05c8617bc1cb292b67b8c8d40723846914c20fc':
  Fix a crash where the deletion helper crashes when app sizes load.

Change-Id: I0f32008388d8f462df95d1655f43869031be0c20
2016-05-24 15:45:58 +00:00
Daniel Nishi
c05c8617bc Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev 2016-05-24 15:36:22 +00:00
Android Build Merger (Role)
f1cbf0a3f2 Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8a85828424" into nyc-mr1-dev-plus-aosp 2016-05-24 14:24:22 +00:00