Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,830 Commits 3 Branches 0 Tags
46ef3bdf28fa1d37ad4a159de1bd6b150bfbfaaa
Commit Graph

23324 Commits

Author SHA1 Message Date
Aga Wronska
bfdf3d74de Merge "Made breadcrumb drop down match mocks" into nyc-dev am: e5a3bb76b8 
am: 9ca0c0564e

* commit '9ca0c0564e4991468b5a1434ac1b1334b7d9cda0':
  Made breadcrumb drop down match mocks
 2016-03-04 22:43:32 +00:00
Aga Wronska
9ca0c0564e Merge "Made breadcrumb drop down match mocks" into nyc-dev 
am: e5a3bb76b8

* commit 'e5a3bb76b8b50aee73d7a7f23af67fc153564c2a':
  Made breadcrumb drop down match mocks
 2016-03-04 22:41:30 +00:00
Winson
5f32bac735 Merge "Use the non-override task progress for calculating the z." into nyc-dev am: e27a4376ab 
am: 895ceea504

* commit '895ceea504a4fded13cc08b654fea72167efd3e1':
  Use the non-override task progress for calculating the z.
 2016-03-04 22:39:48 +00:00
Aga Wronska
e5a3bb76b8 Merge "Made breadcrumb drop down match mocks" into nyc-dev 2016-03-04 22:37:41 +00:00
Winson
895ceea504 Merge "Use the non-override task progress for calculating the z." into nyc-dev 
am: e27a4376ab

* commit 'e27a4376aba021f72771d28daf656307a32e8ce3':
  Use the non-override task progress for calculating the z.
 2016-03-04 22:36:32 +00:00
Winson Chung
e27a4376ab Merge "Use the non-override task progress for calculating the z." into nyc-dev 2016-03-04 22:31:01 +00:00
Aga Wronska
b6db022312 Made breadcrumb drop down match mocks 
Bug: 27136601
Change-Id: I93af07a45defaddd7f5785fac8b686984a889583
 2016-03-04 14:05:39 -08:00
Julia Reynolds
776b2133a6 Merge "Redlines for inline settings." into nyc-dev am: da52422a83 
am: 2a6646acdc

* commit '2a6646acdc561108d7f1090fb8bf3b7a3befa1c8':
  Redlines for inline settings.
 2016-03-04 21:58:59 +00:00
Julia Reynolds
2a6646acdc Merge "Redlines for inline settings." into nyc-dev 
am: da52422a83

* commit 'da52422a83536825dcc6ed9cb2255ae56ef3bfc2':
  Redlines for inline settings.
 2016-03-04 21:55:08 +00:00
Joe Onorato
b686b03272 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev am: 5d4ab988bd 
am: 15e93f3715

* commit '15e93f3715742d0ffad6089cf804842f2e5f393b':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-03-04 21:53:06 +00:00
Joe Onorato
15e93f3715 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev 
am: 5d4ab988bd

* commit '5d4ab988bd18bb1fc339f39d6f0cf225b6561903':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-03-04 21:48:35 +00:00
Julia Reynolds
da52422a83 Merge "Redlines for inline settings." into nyc-dev 2016-03-04 21:47:56 +00:00
Joe Onorato
93dcff0122 Turn down the logging a little bit. 
Change-Id: I5760eb7d6d6ed5e8a3426e92c835e8a71e10cdbb
 2016-03-04 12:21:30 -08:00
Steve McKay
0c648c6648 Merge "Revert "Hide Files app launcher icon."" into nyc-dev am: 9eb7190af5 
am: 5b7abfb55d

* commit '5b7abfb55d2ce1ffe5e89e6c5e995c34e9eff9e1':
  Revert "Hide Files app launcher icon."
 2016-03-04 20:01:18 +00:00
Steve McKay
5b7abfb55d Merge "Revert "Hide Files app launcher icon."" into nyc-dev 
am: 9eb7190af5

* commit '9eb7190af54f3534afd3887c68cd414b210a1628':
  Revert "Hide Files app launcher icon."
 2016-03-04 19:58:06 +00:00
Steve McKay
9eb7190af5 Merge "Revert "Hide Files app launcher icon."" into nyc-dev 2016-03-04 19:54:36 +00:00
Steve McKay
080d71b130 Revert "Hide Files app launcher icon." 
This reverts commit 24e4604595.

Un-hiding this for continued development in nyc-dev.

Based on conversations between those at higher paygrades, we'll either leave this visible or re-hide prior to next dev release.

Change-Id: I235eb0f593daa7b34ea10ed4c9df4eaa6c68078c
 2016-03-04 19:52:55 +00:00
Steve McKay
4608fbe713 Merge "Hide Files app launcher icon." into nyc-dev am: 58e8d467bd 
am: 3bfedb2054

* commit '3bfedb205406c70d8214d2e6aa42c3cb39ebc87d':
  Hide Files app launcher icon.
 2016-03-04 19:51:14 +00:00
Steve McKay
3bfedb2054 Merge "Hide Files app launcher icon." into nyc-dev 
am: 58e8d467bd

* commit '58e8d467bdb2455f60fd6e8c1963f1dfe28e23c3':
  Hide Files app launcher icon.
 2016-03-04 19:47:58 +00:00
Steve McKay
58e8d467bd Merge "Hide Files app launcher icon." into nyc-dev 2016-03-04 19:42:34 +00:00
Julia Reynolds
aebacc94c0 Redlines for inline settings. 
Change-Id: I535f84f70444caf376b671352da8da94b764b1eb
 2016-03-04 14:37:45 -05:00
Winson
8f97c83b2e Use the non-override task progress for calculating the z. 
- This guarantees that they won’t collide, where as the override task
  progresses will as tasks animate while dragging to dismiss.

Change-Id: I25eded22c13b38428d849062c6d95893f3fff5c5
 2016-03-04 19:33:50 +00:00
Steve McKay
24e4604595 Hide Files app launcher icon. 
Bug: 27498061

Change-Id: Ifc76ef731a623e95839252a6c9483ce3546c9930
 2016-03-04 11:33:46 -08:00
Aga Wronska
ee608e3ad3 Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev am: 8d07a1d757 
am: 5e3f2740ae

* commit '5e3f2740aee7ecd3664181ab1e60c58c6c5088c0':
  Fixed arranging the views when in tablet landscape layout.
 2016-03-04 19:23:41 +00:00
Aga Wronska
5e3f2740ae Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev 
am: 8d07a1d757

* commit '8d07a1d7574c93e6cf3e487ebb74d9779047a463':
  Fixed arranging the views when in tablet landscape layout.
 2016-03-04 19:21:29 +00:00
Aga Wronska
8d07a1d757 Merge "Fixed arranging the views when in tablet landscape layout." into nyc-dev 2016-03-04 19:15:59 +00:00
Aga Wronska
511ee39691 Fixed arranging the views when in tablet landscape layout. 
Bug: 27473988
Change-Id: Id0333af9d9c63e1292d234543cd5950ae201f66a
 2016-03-04 11:13:07 -08:00
Yorke Lee
e1cfcfbce3 Merge "Make isPanelFullyCollapsed public" into nyc-dev am: e5ccccd3be 
am: 54d87384a8

* commit '54d87384a85c5b3926076593d0c5a2579c525602':
  Make isPanelFullyCollapsed public
 2016-03-04 17:42:47 +00:00
Yorke Lee
54d87384a8 Merge "Make isPanelFullyCollapsed public" into nyc-dev 
am: e5ccccd3be

* commit 'e5ccccd3beadcc989ba25dc57292724e8f38b574':
  Make isPanelFullyCollapsed public
 2016-03-04 17:40:19 +00:00
Yorke Lee
e5ccccd3be Merge "Make isPanelFullyCollapsed public" into nyc-dev 2016-03-04 17:36:50 +00:00
Jason Monk
04574e0075 Merge "Make QS do simpler anim on lock screen" into nyc-dev am: 84606d704a 
am: 7c6632e870

* commit '7c6632e870e0592be0b4020f726d32be4243c24f':
  Make QS do simpler anim on lock screen
 2016-03-04 16:01:32 +00:00
Jason Monk
7c6632e870 Merge "Make QS do simpler anim on lock screen" into nyc-dev 
am: 84606d704a

* commit '84606d704a5b51da270ad36285f5b16aa7674568':
  Make QS do simpler anim on lock screen
 2016-03-04 15:59:27 +00:00
Jason Monk
84606d704a Merge "Make QS do simpler anim on lock screen" into nyc-dev 2016-03-04 15:52:47 +00:00
Jaewan Kim
00859456fd Merge "PIP: Apply the comment from the previous commit" into nyc-dev am: 26f7ec69de 
am: ff296f98ae

* commit 'ff296f98aea3251e5d934d0feaf1aed935b65f2c':
  PIP: Apply the comment from the previous commit
 2016-03-04 06:34:27 +00:00
Jaewan Kim
ff296f98ae Merge "PIP: Apply the comment from the previous commit" into nyc-dev 
am: 26f7ec69de

* commit '26f7ec69de2a8ad30092058629f337ba297c2f6c':
  PIP: Apply the comment from the previous commit
 2016-03-04 06:32:29 +00:00
Jaewan Kim
88baef6bfc PIP: Apply the comment from the previous commit 
This applies the comment from the following CL
32686b6 PIP: Fix move to full screen

Change-Id: Iece46ee85f6e5c3040c9c1431236319e0dbd4105
 2016-03-04 15:08:41 +09:00
Tomasz Mikolajewski
3f4f8a0b35 Merge "Add broken assert in performance tests of DocumentsUI." into nyc-dev am: 6d6bbf5f28 
am: e0586b2803

* commit 'e0586b2803cc62cb448daf33e8f8cd97630d0b2d':
  Add broken assert in performance tests of DocumentsUI.
 2016-03-04 02:37:30 +00:00
Tomasz Mikolajewski
e0586b2803 Merge "Add broken assert in performance tests of DocumentsUI." into nyc-dev 
am: 6d6bbf5f28

* commit '6d6bbf5f2808e822326322e03c9d336906ff12e4':
  Add broken assert in performance tests of DocumentsUI.
 2016-03-04 02:35:31 +00:00
Tomasz Mikolajewski
6d6bbf5f28 Merge "Add broken assert in performance tests of DocumentsUI." into nyc-dev 2016-03-04 02:31:41 +00:00
The Android Automerger
1ccd57a91c Merge commit '22e01d5611d14cc04055b8abcbd1e8c114a0853c' 2016-03-04 01:05:11 +00:00
Adrian Roos
8ba1556b7f Merge "Disable extract UI on remote input" into nyc-dev am: 139bc62117 
am: e5378328ca

* commit 'e5378328caa2fa025d34fc52d4c70caa641d45b9':
  Disable extract UI on remote input
 2016-03-04 00:54:37 +00:00
Udam Saini
894769d07f Merge "Only adds translucent status bar according to theme values." into nyc-dev am: 9cf94182fc 
am: b104a80bbb

* commit 'b104a80bbb29474c2abc23fd851f10c694120387':
  Only adds translucent status bar according to theme values.
 2016-03-04 00:52:08 +00:00
Jason Monk
65792a6412 Merge "Fix night mode availability" into nyc-dev 
am: 4a6688371f

* commit '4a6688371fd8992c0ac9e97015bcb1128efece50':
  Fix night mode availability
 2016-03-03 23:50:19 +00:00
Sid Soundararajan
e5c321f10c Merge "Add Launch Task Animation, re-do values for red-lines." into nyc-dev 
am: d27dafeade

* commit 'd27dafeadeb38d451826122d0505702abf58bd1d':
  Add Launch Task Animation, re-do values for red-lines.
 2016-03-03 23:45:40 +00:00
Jason Monk
4a6688371f Merge "Fix night mode availability" into nyc-dev 2016-03-03 23:41:42 +00:00
Sid Soundararajan
d27dafeade Merge "Add Launch Task Animation, re-do values for red-lines." into nyc-dev 2016-03-03 23:37:15 +00:00
Jason Monk
1b0afebf37 Fix night mode availability 
Night mode tile is getting auto-added.  Do the safe thing for now
and fix the checks around the tile availability to make sure it
isn't shown when it shouldn't be, then fix the auto-add logic later.

Bug: 27480924
Change-Id: I3d032038cbc77bf478e3c769c6796be289a8d993
 2016-03-03 18:25:54 -05:00
Philip P. Moltmann
83fe4fadc2 Merge "Fix three bugs in the handling of the advanced options activity" into nyc-dev 
am: 556b322649

* commit '556b322649bdc945ff61479d40ad10236b46cccd':
  Fix three bugs in the handling of the advanced options activity
 2016-03-03 23:15:23 +00:00
Philip P. Moltmann
556b322649 Merge "Fix three bugs in the handling of the advanced options activity" into nyc-dev 2016-03-03 23:05:09 +00:00
Yorke Lee
e4ea6ab1e7 Make isPanelFullyCollapsed public 
Change-Id: I3341e5e56a71b0b6cb0c642e8b9f9d13828b898d
 2016-03-03 14:51:49 -08:00