Commit Graph

34070 Commits

Author SHA1 Message Date
John Reck
0def5a5251 am a13a69f0: Merge "Fix layer recycling for GLRenderer"
* commit 'a13a69f0e56a4e9998ec4faa78e24c7431b68e72':
  Fix layer recycling for GLRenderer
2014-02-19 18:40:25 -08:00
John Reck
a13a69f0e5 Merge "Fix layer recycling for GLRenderer" 2014-02-20 02:37:40 +00:00
John Reck
0b2c8df7a6 Fix layer recycling for GLRenderer
Bug: 13007905

Change-Id: I1589f2bb14429099e391c03d7dfb1650da145f28
2014-02-19 18:31:08 -08:00
Dan Stoza
f46b85112d am b88a904d: Merge "Allow disabling layer rotation during screenshots"
* commit 'b88a904dfe719a8cbb0b9d73cb4637c22a1deed4':
  Allow disabling layer rotation during screenshots
2014-02-19 16:58:22 -08:00
Dan Stoza
b88a904dfe Merge "Allow disabling layer rotation during screenshots" 2014-02-20 00:56:33 +00:00
Alan Viverette
4ba1e99bcf am 498aa8bb: Merge "Always redraw background display list when view is redrawn"
* commit '498aa8bb3c51b7c5ba66cb38167263157d13bcc1':
  Always redraw background display list when view is redrawn
2014-02-19 16:50:40 -08:00
Alan Viverette
498aa8bb3c Merge "Always redraw background display list when view is redrawn" 2014-02-20 00:47:40 +00:00
Alan Viverette
81547effac Always redraw background display list when view is redrawn
BUG: 12974357
Change-Id: I358351257e8b099a681e93be8f64e396fdfd6720
2014-02-19 16:31:03 -08:00
RoboErik
3df1380d14 am 33288685: Merge "Initial round of MediaSession APIs"
* commit '332886854438809e956fb232b69879e33b5dc2bb':
  Initial round of MediaSession APIs
2014-02-19 16:27:14 -08:00
RoboErik
3328868544 Merge "Initial round of MediaSession APIs" 2014-02-20 00:25:10 +00:00
Alan Viverette
13138fb588 am ff699570: Check item type before re-binding transient state views
* commit 'ff699570f62113b4df5b0efd74b9df8b9dbcd1a9':
  Check item type before re-binding transient state views
2014-02-19 15:32:29 -08:00
Alan Viverette
ff699570f6 Check item type before re-binding transient state views
BUG: 12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
2014-02-19 15:25:10 -08:00
RoboErik
01fe661ae5 Initial round of MediaSession APIs
This is far from complete but puts the basic components in place
for an app to interact with media sessions.

Change-Id: Icfe313f90ad76ae56badbe42b0e43fc5f68db36f
2014-02-19 13:41:37 -08:00
Ruben Brunk
1dac456eec am 844aa619: Merge "camera3: Update whiteLevel tag."
* commit '844aa619607894124ab05c93780dba091394b2a5':
  camera3: Update whiteLevel tag.
2014-02-19 11:34:05 -08:00
Ruben Brunk
844aa61960 Merge "camera3: Update whiteLevel tag." 2014-02-19 19:31:57 +00:00
John Reck
e022b60d96 am 5efe5a2d: Merge "Support HardwareLayers in RenderThread"
* commit '5efe5a2d35604595913c9e372c904b85c32e71c8':
  Support HardwareLayers in RenderThread
2014-02-19 11:12:50 -08:00
Chris Craik
0f750eb306 am 66d792b6: Merge "Make outline and shadow APIs public"
* commit '66d792b6631a8dfd0dd0b7abc75077760fa083cc':
  Make outline and shadow APIs public
2014-02-19 11:12:43 -08:00
John Reck
5efe5a2d35 Merge "Support HardwareLayers in RenderThread" 2014-02-19 18:58:18 +00:00
John Reck
19b6bcfd83 Support HardwareLayers in RenderThread
Also has a few HardwareLayer lifecycle fixes

Change-Id: I6308cb05f8f199eed72189ace768013a46815941
2014-02-19 10:47:19 -08:00
Chris Craik
66d792b663 Merge "Make outline and shadow APIs public" 2014-02-19 18:11:46 +00:00
John Spurlock
176b211554 am 78702119: am 14833719: am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java
* commit '7870211955631c8e1b3c1932c7c8a46b5c1c9fd5':
  Fix bad @links in PendingIntent.java
2014-02-19 06:07:20 -08:00
John Spurlock
7870211955 am 14833719: am 01573b50: am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java
* commit '14833719e16536ad86943a15ced0d1cb00b65200':
  Fix bad @links in PendingIntent.java
2014-02-19 14:00:31 +00:00
John Spurlock
01573b5011 am 469301f7: am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java
* commit '469301f7edf2201fdbac217fb0ae49652fa9466c':
  Fix bad @links in PendingIntent.java
2014-02-19 13:54:13 +00:00
John Spurlock
469301f7ed am 9dd87081: am 99873565: am ba231fca: Fix bad @links in PendingIntent.java
* commit '9dd87081e4bea9cd48db35fa82b3adeda37a34b5':
  Fix bad @links in PendingIntent.java
2014-02-19 13:51:00 +00:00
John Spurlock
9dd87081e4 am 99873565: am ba231fca: Fix bad @links in PendingIntent.java
* commit '998735652d2449e3ccbac7686b71bf40dca06e94':
  Fix bad @links in PendingIntent.java
2014-02-19 13:47:52 +00:00
John Spurlock
998735652d am ba231fca: Fix bad @links in PendingIntent.java
* commit 'ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
  Fix bad @links in PendingIntent.java
2014-02-19 13:44:14 +00:00
Calin Juravle
d48a4b8da8 am 2f825260: am fbd855cb: am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit '2f825260f69c47cd61f2e85f4c2fd7869bc1f212':
  Fixed a possible infinite loop in JsonReader#skipValue()
2014-02-19 03:34:34 -08:00
Calin Juravle
2f825260f6 am fbd855cb: am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit 'fbd855cb60fc3b7e219ead013511a51d17a4482d':
  Fixed a possible infinite loop in JsonReader#skipValue()
2014-02-19 11:31:17 +00:00
Calin Juravle
78f522d16e am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit '7a4172d190871c6b17124bf86374304cef727984':
  Fixed a possible infinite loop in JsonReader#skipValue()
2014-02-19 11:21:58 +00:00
Jean Chalard
a506f6f4e1 am ca7d37bd: Merge "Fix a crash where user data was not validated."
* commit 'ca7d37bd270addab2fb764c86b56792bc9349730':
  Fix a crash where user data was not validated.
2014-02-18 20:14:38 -08:00
Jean Chalard
ca7d37bd27 Merge "Fix a crash where user data was not validated." 2014-02-19 03:18:32 +00:00
Dan Sandler
e515b32dcd am 6c306b8e: Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS."
* commit '6c306b8e4e1cd1bf303c58676148378116b2e396':
  Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
2014-02-18 18:28:31 -08:00
Dan Sandler
6c306b8e4e Merge "Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." 2014-02-19 02:26:02 +00:00
Fabrice Di Meglio
b8b54bc69c am c39d3d32: Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog""
* commit 'c39d3d32abd70dd48ba58b6fb28b12bb61e375d9':
  Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
2014-02-18 17:19:09 -08:00
Fabrice Di Meglio
c39d3d32ab Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"" 2014-02-19 01:14:46 +00:00
Fabrice Di Meglio
494440be14 Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
This reverts commit 08189afdb0.

Change-Id: Ie8797daca642685ee9a2a541d11a35daa28f0564
2014-02-19 01:11:21 +00:00
Chris Craik
e9b8817bd7 Make outline and shadow APIs public
Change-Id: If40dc27b2fdc41c3ed355bc9029474b1344c1a03
2014-02-18 16:55:45 -08:00
Jay Shrauner
8b9a2278d2 am ae586241: Merge "Prevent SpellChecker from setting invalid range"
* commit 'ae58624157798ef72be6bcbdaaca7979302e3f7f':
  Prevent SpellChecker from setting invalid range
2014-02-18 16:27:18 -08:00
Jay Shrauner
ae58624157 Merge "Prevent SpellChecker from setting invalid range" 2014-02-19 00:24:39 +00:00
Craig Mautner
1bf3795798 am db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
* commit 'db0f3e825fb4da01f887c41a877708734b0899e3':
  Allow "opaque" flag to be updated. DO NOT MERGE
2014-02-18 23:59:42 +00:00
Craig Mautner
db0f3e825f Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev 2014-02-18 23:56:53 +00:00
Andy McFadden
4f0a80d0b8 Allow "opaque" flag to be updated. DO NOT MERGE
Added a setOpaque() call and a bunch of comments.

Bug 12387406

Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
2014-02-18 15:54:24 -08:00
Adam Lesinski
5fdcc33963 am 5441745e: am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup
* commit '5441745effb885589c03050b59885e8a3ad96ad6':
  Create FEATURE_ constants for print and backup
2014-02-18 15:07:14 -08:00
Adam Lesinski
5441745eff am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup
* commit '019b1f2668ac17f5e52b6ce32a524d26134a062a':
  Create FEATURE_ constants for print and backup
2014-02-18 23:03:37 +00:00
Adam Lesinski
2ea983a567 am 3d9bcb90: Create FEATURE_ constants for print and backup
* commit '3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
  Create FEATURE_ constants for print and backup
2014-02-18 22:57:37 +00:00
Dianne Hackborn
2bbd02bbd8 am 93b55c11: Merge "Implement wifi part of issue #12973036: Improve power_profile.xml"
* commit '93b55c1149bb4a03b0df7887182265969af2ab71':
  Implement wifi part of issue #12973036: Improve power_profile.xml
2014-02-18 14:47:07 -08:00
Dianne Hackborn
93b55c1149 Merge "Implement wifi part of issue #12973036: Improve power_profile.xml" 2014-02-18 22:45:17 +00:00
Dianne Hackborn
ca1bf21c51 Implement wifi part of issue #12973036: Improve power_profile.xml
Add battery stats tracking of wifi state.

Also update when we retrieve the current time to use a more
consistent value across stats tracking.

Change-Id: I6a7c3efd58ff2c8ea86dac141c8f848e7996d63f
2014-02-18 14:43:14 -08:00
Dan Sandler
5d7c3cc66c Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.
$ adb shell settings put global lock_screen_show_notifications 1

Previously a per-user secure setting
(Settings.Secure.LOCK_SCREEN_ALLOW_NOTIFICATIONS), but this
doesn't really make a lot of sense since this behavior
pertains to areas of the system (keyguard, status bar) that
exist outside of any one user.

This setting now effectively enables notifications on the
secure lockscreen for all users.

Change-Id: I9c5179498dbbba9343184efdedb1587ea862cf96
2014-02-18 17:35:15 -05:00
Dan Sandler
2db7163cf0 am 2b330dde: Merge "Allow a user to elect to see private notifications in public."
* commit '2b330dde2c46e6e94687649b8e888f9a2d9855bf':
  Allow a user to elect to see private notifications in public.
2014-02-18 14:33:51 -08:00