Commit Graph

3636 Commits

Author SHA1 Message Date
Udam Saini
36461ab4fd Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1 am: be21812
am: 8e9323b840

* commit '8e9323b840b47b31ce294584789929191a578a35':
  Fixes a string for tablets/devices

Change-Id: Ifc93fc2f12ac5e0e937d7bf23196db292a767e9c
2016-04-21 03:27:07 +00:00
Ruben Brunk
af29fad670 Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110 am: 0db43e4
am: df317dba47

* commit 'df317dba4759d97cf78c78b023449090d36e4552':
  Add settings for altering VR display behavior.

Change-Id: Ib364edb27c678f2bb232fda3b7216b1ca0ac8874
2016-04-21 03:26:55 +00:00
Jason Monk
97f31d2942 Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc am: 040acf7
am: 36a3081447

* commit '36a30814476c1a182c0501af7a7f3721a3b8cfde':
  Daydream -> Screen saver

Change-Id: I6823cabfd270bed0698a926ceec6e2816b00b631
2016-04-21 03:26:43 +00:00
Udam Saini
be21812827 Merge "Fixes a string for tablets/devices" into nyc-dev
am: e0892e1

* commit 'e0892e16adb55e3f0b368b9d461efae09bf38c5b':
  Fixes a string for tablets/devices

Change-Id: Ia183de4fa9330a6e89bb53d2f16d5a0a8f286456
2016-04-20 21:04:30 +00:00
Udam Saini
e0892e16ad Merge "Fixes a string for tablets/devices" into nyc-dev 2016-04-20 20:54:41 +00:00
Fan Zhang
01f177982d Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev 2016-04-20 20:50:17 +00:00
Ruben Brunk
0db43e44d0 Merge "Add settings for altering VR display behavior." into nyc-dev
am: 3a3d110

* commit '3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
  Add settings for altering VR display behavior.

Change-Id: I051c2374bfc6ecaafff178e06079434958f53136
2016-04-20 20:04:03 +00:00
Ruben Brunk
3a3d110a50 Merge "Add settings for altering VR display behavior." into nyc-dev 2016-04-20 19:51:50 +00:00
Ruben Brunk
e4d95c087b Add settings for altering VR display behavior.
Bug=28208992

Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8
2016-04-20 12:49:05 -07:00
Fan Zhang
2869157ba9 Display setting and support in a tab layout - DO NOT MERGE
Bug: 28269035
Bug: 28139604
2016-04-20 11:42:15 -07:00
Udam Saini
415fef89f3 Fixes a string for tablets/devices
Had accidentally always set this to phone.

bug:28293197
Change-Id: I926e4c9681f2e7e660bdc2664256c8a7ea6e7951
2016-04-20 11:27:02 -07:00
Jason Monk
040acf7dab Merge "Daydream -> Screen saver" into nyc-dev
am: ea80ebc

* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
  Daydream -> Screen saver

Change-Id: I2536df1ef2c588a70f3820b15efda3b2fa366cae
2016-04-20 17:56:04 +00:00
Jason Monk
1ecc1f69b8 Daydream -> Screen saver
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243
2016-04-20 13:39:18 -04:00
Andrew Sapperstein
13792886a7 Create feature factory interface & initial impl.
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.

Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.

BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
(cherry picked from commit 867bb9c07a)
2016-04-19 23:01:49 +00:00
Noah Wang
f2ff8893ff Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6 am: 1c94e6d
am: 0b420fd

* commit '0b420fdad1d020ed20effc6230378074b03f7547':
  Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996

Change-Id: I0e02bc9da6da571079ec560ab89a64c1283e8586
2016-04-19 18:21:55 +00:00
Noah Wang
4f63bb69f5 Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev 2016-04-19 17:56:50 +00:00
Fan Zhang
6fca010cd6 Merge "Request SupportFeatureProvider to provide a support tab." 2016-04-19 17:13:16 +00:00
Fan Zhang
bd1c27ee1e Request SupportFeatureProvider to provide a support tab.
Bug: 28139604

In dashboard container, if supportFeatureProvider is able to provide a
tab, we display it in tabbed layout. Otherwise, display just
DashboardSummary without changing UI.

Change-Id: Ib7601ac925e1315e6b0928d020fe2d09bd389cd7
2016-04-19 08:30:20 -07:00
Felipe Leme
b2ada34cbe Handle blacklisted apps on Data Saver whitelist. am: c2ef27f am: 004a33f
am: 52e92fd

* commit '52e92fd6c429960c4434c1736215255b57271d9a':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: I548b211925145174681ae74c606c92b0fb0e6dee
2016-04-18 22:53:21 +00:00
Felipe Leme
c2ef27faf4 Handle blacklisted apps on Data Saver whitelist.
When user blacklists an app for background data access, the
"Unrestricted data access" list should not display the whitelist toggle
option, but rather explain background access is turned off and offer the
option to open the app's data usage screen to turn it back on.

It still does not handle changed received by DataSaverBackend, so the UI
will be stale when the user removes a blacklist and navigates back to
the list.

BUG: 27481520

Change-Id: I9d0fa9f0180a69ce9bd1417921bf89ec3ba31f01
2016-04-18 13:14:01 -07:00
Noah Wang
35a95617fd Fix preview screen crashing and glitches for
Display / Font size
Bug: 28223545
Bug: 28223533
Bug: 28210654
Bug: 28210242
Bug: 28208955
Bug: 27699996

Change-Id: I80339dabbd089db8a6c6a80645baabb9b4cad00e
2016-04-18 13:08:56 -07:00
Daniel Nishi
781ad72bc7 Merge "Add a deletion helper view for clearing space." 2016-04-18 16:43:26 +00:00
Ido Ofir
f472716ba2 Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev am: 7f4892f
am: 5a9cff7

* commit '5a9cff708f3c83a71c9610ec52453acf21aff649':
  Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size.

Change-Id: I12d6c2c7fe63f1bc7a3a6798a3070f8cef2bf541
2016-04-15 23:29:13 +00:00
Ido Ofir
7f4892f223 Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev 2016-04-15 23:16:51 +00:00
Ido Ofir
81513d7a88 Changing dimensions and margins for fingerprint image in portrait mode.
Landscape layout remains the same with fixed size.

Bug: 27875410

Change-Id: I82ee12ef5efab8bee6a0e187810b399cb45b7f67
2016-04-15 13:30:01 -07:00
Daniel Nishi
a671272bf6 Add a deletion helper view for clearing space.
This view provides an interface which allows users to clear out
apps and other data which they may no longer need to alleviate
storage pressure. This implementation gives the bits to uninstall
apps which have not been used within the last 60 days from the
system.

A future patch will add in the ability to extend the deletion helper
view to have additional clearing types.

Change-Id: I65cba54ca247d52227e67e2fa9b84fe63fb8ab34
2016-04-15 09:06:32 -07:00
Julia Reynolds
0986daa6cc Merge "Notification slider changes." into nyc-dev am: 8b01df5
am: 29eeaf9

* commit '29eeaf9530fa116f7ad890ed438c4e5de7486dff':
  Notification slider changes.

Change-Id: I6427f467d58cf40a8b6ba3067b0007b6e11a2927
2016-04-15 15:38:32 +00:00
Julia Reynolds
088fb52ef8 Notification slider changes.
Bug: 27558254
Change-Id: I15635ae19e82a57d6e6fcb2f8f946f31bebf5d0f
2016-04-15 11:04:13 -04:00
Noah Wang
644f7785e9 Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev am: 7444be6
am: 36b15ba

* commit '36b15ba0be48d0d417ad66f516f30b6f2035252c':
  Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf

Change-Id: I4912c21ebabec8430b62054e55689956695b42b7
2016-04-14 20:29:09 +00:00
Julia Reynolds
4744f085c3 Merge "Notification listeners have full DND access." into nyc-dev am: cc43dd9
am: de8799c

* commit 'de8799cc032270c3b1990d34c9f664059c4e31c7':
  Notification listeners have full DND access.

Change-Id: I53ed3ed064179423196d10e9692c51e98ad5508e
2016-04-14 20:29:07 +00:00
TreeHugger Robot
44c2379757 Merge "Data Saver Mode phrasing tweaks." into nyc-dev am: 6a41da8
am: 4e77421

* commit '4e7742114bb33ffb008bb937a67b26f7cac70570':
  Data Saver Mode phrasing tweaks.

Change-Id: I9220415d09ebb32abbf917f8f347416dba02768a
2016-04-14 20:29:06 +00:00
Noah Wang
7444be6f28 Merge "Remove the preview screens from Display/Font size settings when the activity height is smaller. Also refactored for readability. Bug: 27699996 Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf" into nyc-dev 2016-04-14 05:10:49 +00:00
Julia Reynolds
cc43dd935f Merge "Notification listeners have full DND access." into nyc-dev 2016-04-14 00:58:09 +00:00
Noah Wang
45393213da Remove the preview screens from Display/Font size settings
when the activity height is smaller.
Also refactored for readability.
Bug: 27699996
Change-Id: Iff3c3ffdc1ccf82080cafdcedf392e499175acaf
2016-04-13 16:55:11 -07:00
TreeHugger Robot
6a41da8e9a Merge "Data Saver Mode phrasing tweaks." into nyc-dev 2016-04-13 23:36:28 +00:00
Andrew Sapperstein
dd434719df Merge "Create feature factory interface & initial impl." 2016-04-13 23:17:13 +00:00
Felipe Leme
1e890cb8f7 Data Saver Mode phrasing tweaks.
BUG: 28133736
Change-Id: I29c293d001c54aa6aaff33fbc9d086cf9c50da98
2016-04-13 13:58:35 -07:00
Julia Reynolds
83f35ba88d Notification listeners have full DND access.
Bug: 27976092
Change-Id: I9603d900d7cee5666ec3567b4f42fee6d93ae5f8
2016-04-13 16:55:31 -04:00
Andrew Sapperstein
867bb9c07a Create feature factory interface & initial impl.
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.

Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.

BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
2016-04-13 13:02:38 -07:00
Sudheer Shanka
b1ab7b2fdc Merge "Add new section in Apps screen to show app installer name." into nyc-dev am: f13a6a1
am: b196bb8

* commit 'b196bb89f4b7834c3f1f92e1f7c987f29f51af81':
  Add new section in Apps screen to show app installer name.

Change-Id: Idd3eb41595a924a1cf8d013bbb328b206633f142
2016-04-13 18:11:01 +00:00
Sudheer Shanka
f13a6a1795 Merge "Add new section in Apps screen to show app installer name." into nyc-dev 2016-04-13 17:47:05 +00:00
Victor Chang
3ade92eaed Merge ""CA cert installed" notification should take PO into account" into nyc-dev am: 60c7635
am: 676250e

* commit '676250e35b9345b90a9690d36c077d319c3d9da9':
  "CA cert installed" notification should take PO into account

Change-Id: I982449c67976c755d38b1253688f1b7e5d8ea47e
2016-04-13 10:28:34 +00:00
Victor Chang
60c76357a0 Merge ""CA cert installed" notification should take PO into account" into nyc-dev 2016-04-13 10:15:28 +00:00
Victor Chang
17ead044e1 "CA cert installed" notification should take PO into account
- PO shows same dialog as DO, as shown in UI mock
- Keep consumer message the same
- Add cancel button
- string change
- remove TYPE_SYSTEM_ALERT due to the bug that the dialog is shown in primary user and bypass work challenge
  (Step: unlock work user -> launch dialog -> lock work user -> unlock personal user -> the dialog is still shown)
- Remove dismissKeyguard, because I believe the dialog should still be protected by the keyguard

Bug: 25772443
Bug: 18224038
Change-Id: I4f2580d1f6d2f88cfeadebcf6e8b0406e5c4b413
2016-04-13 11:13:58 +01:00
Chris Wren
285ad580df Merge "update station to show ranking and autobundles" into nyc-dev am: 106d8e5
am: 7b4a9dc

* commit '7b4a9dc9ccf44aa738c1cb1834c593c91db383e6':
  update station to show ranking and autobundles

Change-Id: I049fa6fe4746532547d0c7f65a9c603c50e6dbb5
2016-04-13 00:33:25 +00:00
Chris Wren
106d8e57ce Merge "update station to show ranking and autobundles" into nyc-dev 2016-04-12 21:02:15 +00:00
Jason Monk
f96916606d Merge "Add demo mode to dev options" into nyc-dev am: 7b5c400
am: 2230710

* commit '2230710d319745294f44b696d09301f15f281493':
  Add demo mode to dev options

Change-Id: I54c5a963461127e04f7169ecc90ba367f4883dd1
2016-04-12 19:14:37 +00:00
Udam Saini
c72a8de8dc Merge "Increase string char limit." into nyc-dev am: 7f6ba63
am: 0ec0ffd

* commit '0ec0ffde587d87edffb75bf5ffae4a2024b2409a':
  Increase string char limit.

Change-Id: I60961d02c21bc409996ac100ba6d5fff1f6194cc
2016-04-12 18:55:46 +00:00
Jason Monk
7b5c4007e2 Merge "Add demo mode to dev options" into nyc-dev 2016-04-12 18:53:18 +00:00
Udam Saini
7f6ba63fcf Merge "Increase string char limit." into nyc-dev 2016-04-12 17:42:53 +00:00