drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,654 Commits 1 Branch 0 Tags
Commit Graph

246654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Carr
ee651e63e0 Merge \"Ensure pinned animation scaling is consistently applied.\" into nyc-dev 
am: 3207d8f8a1

Change-Id: Id17634723fd1fce94cd62f29322a23c5f67dda89
 2016-06-08 20:28:17 +00:00
Selim Cinek
1c5baaaa8e Merge changes I0ca13626,I3677ce54 into nyc-dev 
am: b99e19c729

Change-Id: Ied2e9dd7c4b3cd474f00018401e49f061a43a4cf
 2016-06-08 20:28:12 +00:00
Jason Monk
ca3a4c6c0f Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev 
am: bbcb733d80

Change-Id: I048576c6a65ac4ca884dbca131b050dc8599ae3f
 2016-06-08 20:28:08 +00:00
Jason Monk
afeed41526 Merge \"QS: Fix leak in QSAnimator\" into nyc-dev 
am: fd6e7e6790

Change-Id: Ic648b5e22c18337cb1e71c93adfb78dcc9707bac
 2016-06-08 20:28:06 +00:00
Jason Monk
65b9e45e3a Merge \"QS: Show date even on small screens\" into nyc-dev 
am: 883da638e2

Change-Id: I4bc7594fa5004c8d58933d9432a70353474f07e4
 2016-06-08 20:28:04 +00:00
Adrian Roos
3207d8f8a1 Merge "Direct Reply: Add back emoji button" into nyc-dev 2016-06-08 20:25:01 +00:00
Jason Monk
5aa661d7c0 resolve merge conflicts of fbf366d to nyc-mr1-dev 
Change-Id: If2c3d07d680c36b206fe49a8e8e7dc20619a5c42
 2016-06-08 16:24:16 -04:00
TreeHugger Robot
174e41b1fd Merge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-08 20:23:03 +00:00
Adrian Roos
713fed9226 Direct Reply: Add back emoji button 
Bug: 29077108
Change-Id: Ibd1423465c5ec9aced4c4b77575a469f5e85f20d
 2016-06-08 13:22:25 -07:00
Will Harmon
0f1f4f06bc Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev 
am: 4455fc734c

Change-Id: I3f5e4eb86d8a14393a853669a401090046a31da3
 2016-06-08 20:20:57 +00:00
Jason Monk
76b1217b9a Merge \"Settings: Better handling for disabled tiles\" into nyc-dev 
am: 27eadb6f1d

Change-Id: Iaf1558df689ba4ea033b081ba1c24b5d45d7e36c
 2016-06-08 20:20:52 +00:00
Alan Viverette
7fa09ec4dc Merge \"Return correct default theme on API >= 24\" into nyc-dev 
am: afaa1e9db1

Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497
 2016-06-08 20:20:44 +00:00
Julia Reynolds
40f71ac94f Merge \"Handle alarm firing outside of DND period.\" into nyc-dev 
am: e1451c4e30

Change-Id: I2fe8f9dbc048a830e6c06b4797151aaf306ca481
 2016-06-08 20:20:43 +00:00
Felipe Leme
556ac231e9 Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev 
am: fb5995cfbb

Change-Id: I5f649b54038b586be375394d35fd34453213df0a
 2016-06-08 20:20:41 +00:00
TreeHugger Robot
b99e19c729 Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev 2016-06-08 20:08:38 +00:00
TreeHugger Robot
7f4c846d0a Merge "resolve merge conflicts of 718f321 to nyc-mr1-dev" into nyc-mr1-dev 2016-06-08 20:03:51 +00:00
Wei Wang
a4e2bf4712 Merge "Add launch power hint for activity launch end" into nyc-mr1-dev 2016-06-08 19:53:25 +00:00
Selim Cinek
bbcb733d80 Merge changes I0ca13626,I3677ce54 into nyc-dev 
* changes:
  Fixed a flicker when closing QS without notifications
  Handled expandability and swiping while guts are exposed
 2016-06-08 19:37:40 +00:00
Jason Monk
fd6e7e6790 Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev 2016-06-08 19:12:20 +00:00
Jason Monk
883da638e2 Merge "QS: Fix leak in QSAnimator" into nyc-dev 2016-06-08 19:12:07 +00:00
Jason Monk
fbf366d7ee Merge "QS: Show date even on small screens" into nyc-dev 2016-06-08 19:11:41 +00:00
Jason Monk
4455fc734c Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev 2016-06-08 19:11:16 +00:00
Will Harmon
604c2f9440 Fix crash when an app with an active quicksettings tile is updated to no longer have that tile. 
Fixes: 28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
 2016-06-08 19:10:57 +00:00
Jason Monk
27eadb6f1d Merge "Settings: Better handling for disabled tiles" into nyc-dev 2016-06-08 19:10:10 +00:00
Amith Yamasani
211b5b10f6 resolve merge conflicts of 718f321 to nyc-mr1-dev 
Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5
 2016-06-08 18:43:46 +00:00
Ian Pedowitz
afaa1e9db1 Merge "Return correct default theme on API >= 24" into nyc-dev 2016-06-08 18:28:00 +00:00
Julia Reynolds
e1451c4e30 Merge "Handle alarm firing outside of DND period." into nyc-dev 2016-06-08 18:19:13 +00:00
Tianjie Xu
ebfa28ccf8 Merge \"Change unit of I/O statistics to MiB\" into nyc-dev 
am: 00681d0e78

Change-Id: I150ccc3c3164ee487bf4c726b080d885f8b39696
 2016-06-08 18:04:32 +00:00
TreeHugger Robot
fb5995cfbb Merge "Wrap closeQuietly() on finally block." into nyc-dev 2016-06-08 17:59:48 +00:00
Amith Yamasani
718f321369 Merge "Add a separate read permission for oem unlock state" into nyc-dev 2016-06-08 17:55:41 +00:00
Tianjie Xu
00681d0e78 Merge "Change unit of I/O statistics to MiB" into nyc-dev 2016-06-08 17:25:16 +00:00
Sudheer Shanka
31a37ed77f Merge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev 2016-06-08 17:15:04 +00:00
Makoto Onuki
3bb4366006 Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev 2016-06-08 17:00:00 +00:00
Daniel Yu
d05236024e Merge \"docs: Updates for picture-in-picture docs for N DP4\" into nyc-dev 
am: 22dec763a3

Change-Id: Ia70ede8a50300cebba25263976dd350ccc9b30de
 2016-06-08 16:34:09 +00:00
Dan Yu
22dec763a3 Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev 2016-06-08 16:22:27 +00:00
Makoto Onuki
3e27d1254b Merge "ShortcutManager: Optimize package scanning" into nyc-mr1-dev 2016-06-08 16:16:40 +00:00
Felipe Leme
c74972f891 Wrap closeQuietly() on finally block. 
BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
 2016-06-08 09:12:37 -07:00
Alan Viverette
4b2b615669 Return correct default theme on API >= 24 
This method was broken, but it was returning light theme on N preview
builds, so we'll keep it consistent as we move into N release.

Bug: 29192690
Change-Id: I0d16abbe48756070dcd653c39d0da4124ea66b28
 2016-06-08 11:45:15 -04:00
Ricky Wai
711629a27d Merge \"Make Settings->Apps can handle work apps even work profile not enabled yet\" into nyc-dev 
am: 18c8690b7e

Change-Id: I8daa485fcf810c5c5bb40903216f8b989658b5ca
 2016-06-08 14:46:47 +00:00
Jeremy Joslin
8f1fec3dd2 Merge \"Fix #29073394: Need to bind to scorer after user is unlocked.\" into nyc-dev 
am: 464f7e4983

Change-Id: I40be62c7cb0c5802e9cfa3eb913c899c77d3df0e
 2016-06-08 14:39:09 +00:00
Ricky Wai
18c8690b7e Merge "Make Settings->Apps can handle work apps even work profile not enabled yet" into nyc-dev 2016-06-08 14:33:56 +00:00
TreeHugger Robot
464f7e4983 Merge "Fix #29073394: Need to bind to scorer after user is unlocked." into nyc-dev 2016-06-08 14:32:43 +00:00
George Mount
413739e8c6 Re-add Internal API for cross-task Activity used by assistant. 
Bug: 29091742

This reverts commit 563df3b328f5488aaa33b894748029ed00d0e263.

This also fixes the problems experienced by b/29128683.

Change-Id: I8e3d485cb818ea9e03ca475cba88934f6f903f11
 2016-06-08 07:13:37 -07:00
Baligh Uddin
e44803dc37 Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: 002ccec5c1  -s ours

Change-Id: I1d774f175bfff7e90b9253fe84222964f5d97677
 2016-06-08 13:21:51 +00:00
Baligh Uddin
5b96cafec8 Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: e573989e05  -s ours

Change-Id: Ia70e5266178ab687bac8299f6609825b54787b3c
 2016-06-08 13:10:46 +00:00
Baligh Uddin
26e9a5c9f8 Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: c20ea2eb43  -s ours

Change-Id: Ide205acdf26a282bd80ca2eb68b23f1a442c36a4
 2016-06-08 13:10:44 +00:00
Baligh Uddin
25ad61262e Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: 64d6fddc4b  -s ours

Change-Id: Ica64b4dbd45e67e8ed9bcad575126aaccb2bbf17
 2016-06-08 13:10:41 +00:00
Baligh Uddin
74323832de Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: 2d3c74a2fd  -s ours

Change-Id: I44308cc36bf4f3dde8fe34cd0e225914fa3d602d
 2016-06-08 13:10:38 +00:00
Baligh Uddin
002ccec5c1 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-08 13:09:25 +00:00
Jason Monk
fcad09a777 Settings: Better handling for disabled tiles 
Push disabling into SettingsDrawerActivity and add a blacklist to
make sure they disappear immediately.

Change-Id: I79b9c596373cf9634008f6be88f4808af70eb071
Fixes: 29080209
 2016-06-08 09:09:06 -04:00