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

229328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve McKay
76be620a6f Grid view padding + explicit background. 
Also move section break holder into the wrapper class.

Change-Id: I949e81af180f11514aff558615cfeda44cb96a3c
 2016-01-12 11:41:26 -08:00
Steve McKay
da161f0b17 Merge "Fix bug where both list and grid buttons are visible." 2016-01-11 23:33:00 +00:00
Chris Craik
987635710f Merge "Fix path position in BakedOpDispatcher" 2016-01-11 23:13:28 +00:00
George Mount
6b99325be9 Merge "Change access to action bar to control-<" 2016-01-11 23:12:00 +00:00
Aga Wronska
d3b8e52009 Merge "Keep Search View visible after search completed Improve Search View behavior Add Search View background color" 2016-01-11 23:05:43 +00:00
Aga Wronska
97831485e7 Keep Search View visible after search completed 
Improve Search View behavior
Add Search View background color

Bug:26143355
Change-Id: Ifdc4bfff56fc6244c571dfbeff4179e1515d53b7
 2016-01-11 14:58:18 -08:00
Julia Reynolds
04fc35428f Merge "Notification banning updates." 2016-01-11 21:32:37 +00:00
Chris Craik
f9b3678534 Fix path position in BakedOpDispatcher 
Change-Id: I73f4bbcf3fe6f5d3fbdf8058b598bb8f1622097c
 2016-01-11 13:26:58 -08:00
John Reck
a16a704af0 am 0c7532ff: am e678b41c: Merge "Fix setName use-after-free" into mnc-dev am: 3a79376bb5 
am: eee53e6d39

* commit 'eee53e6d3912220abeea3dfd8b305c051b43eb4e':
 2016-01-11 21:18:33 +00:00
Wale Ogunwale
29765d04d8 Merge "Fixed NPE in Task#isResizeableByDockedStack" 2016-01-11 21:08:54 +00:00
Wale Ogunwale
5e7409cf6a Fixed NPE in Task#isResizeableByDockedStack 
It is possible for the DisplayContent to be null.

Change-Id: I0a85038ae71a24fb5613237d771bc9222dd61cde
 2016-01-11 13:07:45 -08:00
Shreyas Basarge
89ee618280 Flex time for periodic jobs in JobScheduler 
A periodic job will start only within time
satisfying period - flex < time % period < period.

Bug: 26254850
Change-Id: I97a840446e5592e5151d784800855d909f1790b8
 2016-01-11 20:58:29 +00:00
Chong Zhang
db02dc190f Merge "Fix black screen when launching app from Recents into non-docked area" 2016-01-11 20:42:34 +00:00
Chong Zhang
573e8e1706 Fix black screen when launching app from Recents into non-docked area 
In this case, we're putting the app into a fullscreen stack that is
resized due to docked stack. When setting up the thumbnail scale up
animation, we have to treat this case as animating into freeform window,
as the containing frame will not be fullscreen, and it's not a clip
rect. For freeform windows, we set up scaling and translation, and
don't change the clip rect.

bug: 26435476
Change-Id: Ic1ac71bfc814afd62572027fa11663c80d903a2d
 2016-01-11 12:35:12 -08:00
Philip P. Moltmann
e978af63e6 Merge "Do not add far favorite printers more than once." 2016-01-11 20:22:40 +00:00
Philip P. Moltmann
fcb51b8270 Merge "ApprovedServices might be null, handle the case:" 2016-01-11 20:22:10 +00:00
Winson Chung
42007e34be Merge "Simplifying the task header highlight drawing." 2016-01-11 20:18:47 +00:00
Tingting Wang
9d46b3efd7 Merge "Remove @hide for CONTACT_METADATA_SYNC." 2016-01-11 20:18:37 +00:00
Winson
94a0e89adb Simplifying the task header highlight drawing. 
- Removed unused ripple logic in the task header background, simplifying
  the background and highlight drawing
- Calculating the header highlight from the actual task color now
- Preventing some extra work from happening when the task view size
  changes

Change-Id: I775651f4b9ce8c1cdfa6fb3d77fd6912fd99a93b
 2016-01-11 20:18:25 +00:00
Winson
ad66efa813 Removing HW layers for task view transitions. 
Change-Id: I00377e12d779519bd0fc102480d37382b3ac4ea6
 2016-01-11 20:17:16 +00:00
Winson
b94443d876 Fixing regression in initial task bounds animating into Overview. 
Change-Id: I09e76c97515dd7e38f8696ac6c48016c9d0a5263
 2016-01-11 20:14:03 +00:00
Winson
e6309aa57e Prevent docking via nav bar until user is set up. 
- Also prevents docking if screen pinning is currently active.
- Fixes issue where you could go into recents when setting up a 
  secondary user.

Bug: 26438797
Bug: 26316912
Change-Id: I30576b52842b76184ef0b2252bc572f74a5d6db8
 2016-01-11 20:13:14 +00:00
Winson
778f495f04 Removing code to animate thumbnail scale now that we animate bounds. 
- This CL reverts the code to the previous state where we can just 
  calculate the thumbnail scale from the view bounds.

Change-Id: I156ae915af76055b5177a6bdf0f929bdf6acea01
 2016-01-11 20:11:51 +00:00
Jason Monk
2c8eb3e005 Merge "Fix build" 2016-01-11 19:55:53 +00:00
Philip P. Moltmann
8d978ba1e7 Merge "In rare cases the printing client app might have been dieded before remotePrintDocument.start(). In this case the print spooler should not crash." 2016-01-11 19:41:55 +00:00
Philip P. Moltmann
f7b5018028 Merge "Display toast when print services are disabled." 2016-01-11 19:41:25 +00:00
Jason Monk
057ee76e5c Fix build 
Fix bad merge

Change-Id: I2cd1f32a7e50b8fa1f7f85c52fe34111f7cea577
 2016-01-11 14:37:44 -05:00
Jason Monk
c06fbb1298 Move battery saver notification to QS 
Remove the battery saver notification and instead create a detail
panel within QS that allows it to be turned on and off.

Change-Id: I54654d26183586fa171fda04877a840701f8ef33
 2016-01-11 14:29:23 -05:00
Rob Carr
3d4f83c01f Merge "Implement surfaceRedrawNeeded for GLSurfaceView" 2016-01-11 19:18:25 +00:00
Tingting Wang
e105521736 Remove @hide for CONTACT_METADATA_SYNC. 
Make Contacts App access this flag.

BUG 26491409

Change-Id: I440cb540fbcc5dd3722ecb6e335dd40914cc30b5
 2016-01-11 11:12:03 -08:00
Jeremy Klein
502658dd90 Merge "Add a TETHER_PRIVILEGED permission and use it where needed." 2016-01-11 19:10:22 +00:00
Jose Lima
246c8e9c79 am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev am: 57b7573210 
am: e54704461e

* commit 'e54704461e02437f83ddc7ed432c345d3cec1e9f':
 2016-01-11 19:06:42 +00:00
Steve McKay
9fd87f4f4c Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 19:05:00 +00:00
Steve McKay
f7ade5d9cc am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43 
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
 2016-01-11 19:04:00 +00:00
Steve McKay
48bc4bf872 am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43 
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
 2016-01-11 19:01:55 +00:00
Geoff Mendal
622b16aed3 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:59:56 +00:00
Geoff Mendal
b072232562 am ffdbf7da: (-s ours) am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev am: f68020abf3 -s ours 
am: 44ad3ac50a  -s ours

* commit '44ad3ac50aca8ec2fc23ad1ac9defdc1446d518b':
 2016-01-11 18:59:02 +00:00
Xiaohui Chen
37a106a31d Merge "sysui: refactor out PanelHolder" 2016-01-11 18:58:14 +00:00
Andrew Flynn
39919510a5 am 10dced7a: am ae499d19: Merge "SystemUI Carrier Network Change unit tests" into mnc-dev am: 4aa8c7df2e 
am: dfe384fed8

* commit 'dfe384fed881eaab1d7585fb4e23edfab0823c33':
 2016-01-11 18:56:38 +00:00
Victor Chan
95b28d8a38 Merge "Null check mRecentsComponent and mDivider." 2016-01-11 18:55:22 +00:00
John Reck
108c4503ec Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:53:03 +00:00
John Reck
f06b321970 am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev am: dd447382cd 
am: aa768491c3

* commit 'aa768491c3463849df9f3e52ff37e6d9136271af':
 2016-01-11 18:52:10 +00:00
Jeff Davidson
6cf2fb3f66 Merge "Define new APIs for metering and roaming network stats buckets." 2016-01-11 18:51:20 +00:00
John Reck
eee53e6d39 am 0c7532ff: am e678b41c: Merge "Fix setName use-after-free" into mnc-dev 
am: 3a79376bb5

* commit '3a79376bb5c0f50863295b51544dbf811180682d':
 2016-01-11 18:50:49 +00:00
Jose Lima
e54704461e am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 
am: 57b7573210

* commit '57b7573210750ead5c6a5d6a8ebd41d8e61636ec':
 2016-01-11 18:48:01 +00:00
Geoff Mendal
b596820fef Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:48:01 +00:00
Geoff Mendal
8bfb5dee1f am 577e34c9: (-s ours) am 3f2f2cbb: (-s ours) Import translations. DO NOT MERGE am: 896262ef52 -s ours 
am: 625b8124a0  -s ours

* commit '625b8124a03a2bec5bc168ab27777263a3f8e114':
 2016-01-11 18:46:53 +00:00
Tor Norbye
7058cc4725 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 18:46:10 +00:00
Tor Norbye
f4e932599b am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev am: 20ccf13fbc 
am: a4f3fa62a3

* commit 'a4f3fa62a36a0bcb0dfc3adae54bb802084cd690':
 2016-01-11 18:45:08 +00:00
Steve McKay
2dbf679cf0 am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev 
am: c226801a43

* commit 'c226801a43c17d41e59988adbb77fd06f2f77c9d':
 2016-01-11 18:44:59 +00:00