Deepanshu Gupta
3adb34ee07
am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit '9fcfbfe296d7033ee031171f61b3a33044abee42':
Add methods for Time_Delegate
2014-02-06 02:59:51 +00:00
Deepanshu Gupta
23de8dc262
am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
...
* commit '28e049ef73f5d9301a198ac53535442b697b7ef4':
Optimize layout rendering in layoutlib
2014-02-06 02:59:48 +00:00
Deepanshu Gupta
096e435903
am f2f108fe: am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
...
* commit 'f2f108fe86337a429a0940f264761dbc27f817fe':
Add missing files to fix libphonenumber for layoutlib.
2014-02-06 02:59:45 +00:00
Deepanshu Gupta
5800b19a7a
am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
...
* commit '50b0ce4e8ed353ed841782aeb58963bc084f2e16':
Fix the measurement of text bounds.
2014-02-06 02:59:41 +00:00
Deepanshu Gupta
b156c0197d
am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
...
* commit 'd5129e75968030620a1372e39fcfbc17fe584e17':
Fix a bug in Nine Patch library.
2014-02-06 02:59:38 +00:00
Deepanshu Gupta
9fcfbfe296
am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
...
* commit '3bf38b4165877274067a385cfe6472639a203a58':
Add methods for Time_Delegate
2014-02-06 02:56:45 +00:00
Craig Mautner
af04b113dc
am 14d74b82: am 1bf2b873: Defer detach until animations are complete.
...
* commit '14d74b82363e1a72b967590ee7118b239b276fb4':
Defer detach until animations are complete.
2014-02-06 02:56:44 +00:00
Deepanshu Gupta
28e049ef73
am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
...
* commit '0db6e6a567e25d560586863c7be654a0c1da5795':
Optimize layout rendering in layoutlib
2014-02-06 02:56:42 +00:00
Deepanshu Gupta
f2f108fe86
am a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
...
* commit 'a955314d905f8567c852226ce4f74994826e8777':
Add missing files to fix libphonenumber for layoutlib.
2014-02-06 02:56:39 +00:00
Craig Mautner
643ca1e9a3
am 481b54be: am dc548483: Move activities from DisplayContent to TaskStack
...
* commit '481b54be1acb990bab3933b6248964e351bdcd99':
Move activities from DisplayContent to TaskStack
2014-02-06 02:56:37 +00:00
Deepanshu Gupta
50b0ce4e8e
am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
...
* commit 'fd8cba3ab83972eefc796fa122b0ec9222078b1c':
Fix the measurement of text bounds.
2014-02-06 02:56:36 +00:00
Deepanshu Gupta
d5129e7596
am 8a892279: Fix a bug in Nine Patch library.
...
* commit '8a892279bd1b212311f4200f306a317985463918':
Fix a bug in Nine Patch library.
2014-02-06 02:56:32 +00:00
Alan Viverette
1f9a3a862a
am d5154ec2: Add prototype for borderless touch feedback drawable
...
* commit 'd5154ec2bc7e7c0bdfd14fc784912d390afe43cc':
Add prototype for borderless touch feedback drawable
2014-02-05 18:55:43 -08:00
Deepanshu Gupta
3bf38b4165
Merge "Add methods for Time_Delegate" into klp-dev
2014-02-06 02:06:02 +00:00
Deepanshu Gupta
0db6e6a567
Merge "Optimize layout rendering in layoutlib" into klp-dev
2014-02-06 02:05:42 +00:00
Deepanshu Gupta
a955314d90
Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
2014-02-06 02:05:21 +00:00
Deepanshu Gupta
fd8cba3ab8
Merge "Fix the measurement of text bounds." into klp-dev
2014-02-06 02:04:49 +00:00
Alan Viverette
d5154ec2bc
Add prototype for borderless touch feedback drawable
...
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
2014-02-05 17:53:33 -08:00
Deepanshu Gupta
8a892279bd
Fix a bug in Nine Patch library.
...
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.
Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
2014-02-05 17:16:35 -08:00
Craig Mautner
14d74b8236
am 1bf2b873: Defer detach until animations are complete.
...
* commit '1bf2b873470d2ba8a4ac218da73516cc2b20aa76':
Defer detach until animations are complete.
2014-02-06 01:00:35 +00:00
Craig Mautner
481b54be1a
am dc548483: Move activities from DisplayContent to TaskStack
...
* commit 'dc548483ae90ba26ad9e2e2cb79f4673140edb49':
Move activities from DisplayContent to TaskStack
2014-02-06 01:00:32 +00:00
John Spurlock
8662cab1ee
am 0e29ad02: Merge "Global system setting to override certain window policy."
...
* commit '0e29ad02f9ed46f2f2a9de59249969f9d1bdd7f6':
Global system setting to override certain window policy.
2014-02-05 16:56:17 -08:00
John Spurlock
0e29ad02f9
Merge "Global system setting to override certain window policy."
2014-02-06 00:53:42 +00:00
Dianne Hackborn
6946115e62
am 6eb0fdb9: Merge "Improve logging of first wake lock, history size."
...
* commit '6eb0fdb99bc09210bea4df054a9c8a05daea3d1b':
Improve logging of first wake lock, history size.
2014-02-05 16:44:07 -08:00
Dianne Hackborn
6eb0fdb99b
Merge "Improve logging of first wake lock, history size."
2014-02-06 00:41:49 +00:00
Dianne Hackborn
3d658bf20e
Improve logging of first wake lock, history size.
...
We now try to have a better label for the first wake lock
that is acquired in the log. This is done in two ways:
- The alarm manager now sorts the alarms it is going to
execute so that wakeup alarms are first, which are more
important w.r.t. which one should be logged.
- There is a new power manager facility to make a wake lock
as "unimportant for logging," which just means in battery
stats that a wake lock acquired after that can be considered
the actual one to log. This is only used by the alarm manager
to mark its TIME_TICK alarms as unimportant for logging.
Also reworked the battery history code to be cleaner and a bit
smaller. There is no longer a separate EVENT command, instead
the event code and tag are just another thing that can be included
in an UPDATE command.
The bits used in the first history int are also re-arrange, so
that only the ones that really change a fair amount in the state
bits are up at the top and there is no longer space used for
the command code (since now it is always just UPDATE). This
allows us to have more room for the time delta at the bottom,
to better avoid situations where we need to write an int delta.
Change-Id: I1bb860ae5b558a248800b090b03a84fbf7acd68a
2014-02-05 16:40:51 -08:00
Chong Zhang
3f889a5a26
am d7eab895: Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"
...
* commit 'd7eab895b76d96b1a8ef625ec927c4661972b425':
MediaRecorderTest: add tests for getSurface() and SURFACE source
2014-02-05 16:22:11 -08:00
Chong Zhang
d7eab895b7
Merge "MediaRecorderTest: add tests for getSurface() and SURFACE source"
2014-02-06 00:20:03 +00:00
Craig Mautner
1bf2b87347
Defer detach until animations are complete.
...
Allowing the detach of ActivityStack from DisplayContent to happen
immediately was causing all sorts of problems associated with not
having a Display to complete the animations.
Waiting for animations to complete before either the detach or the
display removal fixes those problems.
Change-Id: I8a5663bfac5c3c1084ff4fcc451e0e38e8080265
2014-02-05 15:37:40 -08:00
Alan Viverette
89a844657d
am 94088e0c: Merge "Adds hotspot support to LayerDrawable and InsetDrawable"
...
* commit '94088e0c6fd7f5c18c85f25c8216b9c1a23015e3':
Adds hotspot support to LayerDrawable and InsetDrawable
2014-02-05 14:19:29 -08:00
Alan Viverette
8ba71d1091
am dc912588: Merge "Temporary fix for background invalidation"
...
* commit 'dc9125880c372b3d3a2af09d48225c9c50b962f7':
Temporary fix for background invalidation
2014-02-05 14:19:27 -08:00
Alan Viverette
94088e0c6f
Merge "Adds hotspot support to LayerDrawable and InsetDrawable"
2014-02-05 22:16:25 +00:00
Alan Viverette
dc9125880c
Merge "Temporary fix for background invalidation"
2014-02-05 22:16:10 +00:00
Christopher Tate
eaa27e8cbf
am f0af5757: Merge "Improve idle-service bind permission description"
...
* commit 'f0af57578eeb38da86610789271cd970ff44b11f':
Improve idle-service bind permission description
2014-02-05 14:05:59 -08:00
Alan Viverette
87980f9a73
Adds hotspot support to LayerDrawable and InsetDrawable
...
Change-Id: Id17f460c8e4e0a6bf9fd39a4a7b8c79fa2df8d29
2014-02-05 14:05:51 -08:00
Alan Viverette
e6875f1575
Temporary fix for background invalidation
...
Not a complete solution, since we could be more efficient, but enough
to have both background display lists and proper invalidation.
Change-Id: I0216a104948c0930760275bb2b98318b0a4487e7
2014-02-05 14:05:17 -08:00
Christopher Tate
f0af57578e
Merge "Improve idle-service bind permission description"
2014-02-05 22:03:33 +00:00
Chris Craik
d89f010bad
am ba9a2156: am 2c764b20: am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
...
* commit 'ba9a21561e09bddf4ba25fd41474fda6cb941bfb':
Fix for positioning of glyphs within a bitmap
2014-02-05 13:55:48 -08:00
Zhijun He
cb49cb32ae
am b77690ce: Merge "Camera2: update aeLock and transform matrix tag specs"
...
* commit 'b77690cea0f146c6823c922a4f8d8ca7336dde21':
Camera2: update aeLock and transform matrix tag specs
2014-02-05 13:52:25 -08:00
Chris Craik
ba9a21561e
am 2c764b20: am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
...
* commit '2c764b20e4a35c509f49e3d9430e135b4f3a0984':
Fix for positioning of glyphs within a bitmap
2014-02-05 21:52:23 +00:00
Zhijun He
b77690cea0
Merge "Camera2: update aeLock and transform matrix tag specs"
2014-02-05 21:49:56 +00:00
Zhijun He
49a3ca9330
Camera2: update aeLock and transform matrix tag specs
...
Change-Id: I436f41ff2bf811a654de15b51739c07def354648
2014-02-05 13:48:09 -08:00
John Spurlock
c6d1c60fb1
Global system setting to override certain window policy.
...
Specifically, the ability to force immersive-mode-like behavior
on the status bar, the navigation bar (or both) on a
package-by-package basis - and to disable immersive mode
confirmations for specific packages.
Change-Id: I2df7092a91eceeb815367ef917dd7289f4f2b27e
2014-02-05 16:45:23 -05:00
Chris Craik
2c764b20e4
am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
...
* commit '0ec3ca6e08e5933016beda147ca9a82e96434b15':
Fix for positioning of glyphs within a bitmap
2014-02-05 21:43:48 +00:00
Chris Craik
0ec3ca6e08
am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
...
* commit '449273e2d575041ffe1a5d435666d36923de888b':
Fix for positioning of glyphs within a bitmap
2014-02-05 13:40:22 -08:00
Hui Shu
a09c820552
am e6415f50: Merge "Fix postUrl to call loadUrl when url is not a network url."
...
* commit 'e6415f50b10fe455df2cbe568a90bc762cce3cf7':
Fix postUrl to call loadUrl when url is not a network url.
2014-02-05 13:38:01 -08:00
Chris Craik
449273e2d5
Merge "Fix for positioning of glyphs within a bitmap"
2014-02-05 21:36:42 +00:00
Craig Mautner
dc548483ae
Move activities from DisplayContent to TaskStack
...
Now that activities and tasks can be detached from a display do not
keep their state within the DisplayContent class. All such state is
now moved to the TaskStack class with this change.
Change-Id: Ie6b1811e9ec3f545782bad8c3461bd4f2d336b93
2014-02-05 13:35:24 -08:00
Hui Shu
e6415f50b1
Merge "Fix postUrl to call loadUrl when url is not a network url."
2014-02-05 21:35:12 +00:00
Hui Shu
c60ad9c3fb
Fix postUrl to call loadUrl when url is not a network url.
...
Change-Id: I4be00611c220572b4e8ecea1a00409a6f5d2bb18
2014-02-05 13:32:37 -08:00