OSDN Git Service
Michael Wright [Mon, 10 Feb 2014 23:56:36 +0000 (15:56 -0800)]
Move inputservice over to frameworks/native
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.
Try 2.
Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
Tim Murray [Mon, 10 Feb 2014 23:43:45 +0000 (23:43 +0000)]
am
27f2d46a: (-s ours) am
eaf82374: am
38d799fc: Merge "Generic object based data copy."
* commit '
27f2d46a24e840ac5682635dddd0e28dd66172ad':
Generic object based data copy.
Tim Murray [Mon, 10 Feb 2014 23:34:54 +0000 (23:34 +0000)]
am
eaf82374: am
38d799fc: Merge "Generic object based data copy."
* commit '
eaf82374186bd7084826f1cd258c82a3c6a4bf29':
Generic object based data copy.
Tim Murray [Mon, 10 Feb 2014 23:29:55 +0000 (15:29 -0800)]
am
38d799fc: Merge "Generic object based data copy."
* commit '
38d799fc7a272c3c6ff7b9bc7b7f9239b45bf98c':
Generic object based data copy.
Tim Murray [Mon, 10 Feb 2014 23:27:05 +0000 (23:27 +0000)]
Merge "Generic object based data copy."
Jason Sams [Tue, 26 Nov 2013 02:28:33 +0000 (18:28 -0800)]
Generic object based data copy.
This change consolidates the copy paths to Object based.
The runtime now uses reflection to identify the type of
array present. This adds support for long/double and reduces
the amount of code present. We could also support arrays of vectors
or objects in the future with this mechanism.
Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
Michael Wright [Mon, 10 Feb 2014 23:09:45 +0000 (23:09 +0000)]
Merge "Revert "Move inputservice over to frameworks/native""
Michael Wright [Mon, 10 Feb 2014 23:08:26 +0000 (15:08 -0800)]
Revert "Move inputservice over to frameworks/native"
This reverts commit
89e5c7ebb37fabc4368e87e17a502db62598bd61.
Michael Wright [Mon, 10 Feb 2014 22:42:01 +0000 (22:42 +0000)]
Merge "Move inputservice over to frameworks/native"
Michael Wright [Mon, 10 Feb 2014 22:41:25 +0000 (22:41 +0000)]
Merge "Remove SkRegion dependency from libinput"
Colin Cross [Mon, 10 Feb 2014 22:14:53 +0000 (22:14 +0000)]
am
675d44ad: am
12f1f5b8: am
40545f32: Merge "frameworks/base: fix errors inside ALOGV"
* commit '
675d44ad2355eb4404e286f2c337196297d1e26f':
frameworks/base: fix errors inside ALOGV
Michael Wright [Mon, 10 Feb 2014 22:10:27 +0000 (14:10 -0800)]
Move inputservice over to frameworks/native
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.
Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
Colin Cross [Mon, 10 Feb 2014 22:09:12 +0000 (22:09 +0000)]
am
12f1f5b8: am
40545f32: Merge "frameworks/base: fix errors inside ALOGV"
* commit '
12f1f5b87326a31f4c69e949a1e645e82c9152d4':
frameworks/base: fix errors inside ALOGV
Colin Cross [Mon, 10 Feb 2014 22:06:09 +0000 (14:06 -0800)]
am
40545f32: Merge "frameworks/base: fix errors inside ALOGV"
* commit '
40545f32d3364604dac0c21a0310c26f7596e3a8':
frameworks/base: fix errors inside ALOGV
Colin Cross [Mon, 10 Feb 2014 22:02:50 +0000 (22:02 +0000)]
Merge "frameworks/base: fix errors inside ALOGV"
Amith Yamasani [Mon, 10 Feb 2014 21:43:18 +0000 (13:43 -0800)]
Fix NPE on removing a user
Bug:
12957232
Check for null mDeviceOwner.
Change-Id: I107dc24d1a8de121ebd2c1bb56e1af40bb1c55ac
Michael Wright [Thu, 6 Feb 2014 02:02:40 +0000 (18:02 -0800)]
Remove SkRegion dependency from libinput
This gets us one step closer to removing our dependency on Skia, which is at
least one of the things blocking us from moving the input system out of
f/b.
Change-Id: I755e6267996c93fe700f1056327386923287575a
John Spurlock [Mon, 10 Feb 2014 20:43:14 +0000 (20:43 +0000)]
Merge "Fix NPE in PolicyControl."
John Spurlock [Mon, 10 Feb 2014 20:36:24 +0000 (15:36 -0500)]
Fix NPE in PolicyControl.
Bug:
12957738
Change-Id: I8051a7a0656f50ed63321f9a79faf0383d7c66b4
Leon Scroggins III [Mon, 10 Feb 2014 20:30:50 +0000 (20:30 +0000)]
Merge "Decode file descriptor from the correct offset."
Deepanshu Gupta [Mon, 10 Feb 2014 20:04:05 +0000 (20:04 +0000)]
am
f7193bf8: am
d9f9da39: am
56b86deb: am
1c91b1f7: am
45dbfcc7: Improve text rendering and measurement.
* commit '
f7193bf89780039cf924dd7d1bb67f4830517231':
Improve text rendering and measurement.
Deepanshu Gupta [Mon, 10 Feb 2014 19:56:58 +0000 (19:56 +0000)]
am
d9f9da39: am
56b86deb: am
1c91b1f7: am
45dbfcc7: Improve text rendering and measurement.
* commit '
d9f9da396b41f394991f676bc74dcfc59c7070a8':
Improve text rendering and measurement.
Deepanshu Gupta [Mon, 10 Feb 2014 19:53:48 +0000 (19:53 +0000)]
am
56b86deb: am
1c91b1f7: am
45dbfcc7: Improve text rendering and measurement.
* commit '
56b86debcfaf8f661011702d31854bb3804f5fe1':
Improve text rendering and measurement.
Deepanshu Gupta [Mon, 10 Feb 2014 19:50:58 +0000 (19:50 +0000)]
am
1c91b1f7: am
45dbfcc7: Improve text rendering and measurement.
* commit '
1c91b1f7a2da5e5b1996217228399ef958c2be0c':
Improve text rendering and measurement.
Deepanshu Gupta [Mon, 10 Feb 2014 19:47:20 +0000 (19:47 +0000)]
am
45dbfcc7: Improve text rendering and measurement.
* commit '
45dbfcc781a3926d22571b6ccfa3f27ec896f119':
Improve text rendering and measurement.
Derek Sollenberger [Mon, 10 Feb 2014 19:19:06 +0000 (19:19 +0000)]
Merge "Removing SkiaColorFilter and inspecting the native object directly."
Chris Craik [Mon, 10 Feb 2014 18:58:53 +0000 (18:58 +0000)]
Merge "Add shadow casting / global perspective APIs, hidden for now."
Griff Hazen [Mon, 10 Feb 2014 18:01:27 +0000 (18:01 +0000)]
am
edb555ed: am
92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev
* commit '
edb555edceaf51f7ef40e35257a4b00c06a68e72':
Fix ActivityView layout bug.
Griff Hazen [Mon, 10 Feb 2014 17:54:57 +0000 (17:54 +0000)]
am
92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev
* commit '
92ade49ecaa23cd77510ee0bc1dbc6355eb581ed':
Fix ActivityView layout bug.
Griff Hazen [Mon, 10 Feb 2014 17:51:35 +0000 (17:51 +0000)]
Merge "Fix ActivityView layout bug." into klp-modular-dev
Ricardo Cervera [Mon, 10 Feb 2014 17:38:43 +0000 (17:38 +0000)]
am
a11ac26b: am
9d6e456d: am
332aefe9: am
d038afd3: am
7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug:
12815243" into klp-docs
* commit '
a11ac26b0e012eb9b9829afc74095a5cc6292452':
docs: Fixed ViewPager animation tutorial. Bug:
12815243
Ricardo Cervera [Mon, 10 Feb 2014 17:32:25 +0000 (17:32 +0000)]
am
9d6e456d: am
332aefe9: am
d038afd3: am
7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug:
12815243" into klp-docs
* commit '
9d6e456d777a147444da650e10ca9dfc1a64b9cd':
docs: Fixed ViewPager animation tutorial. Bug:
12815243
Ricardo Cervera [Mon, 10 Feb 2014 17:29:19 +0000 (17:29 +0000)]
am
332aefe9: am
d038afd3: am
7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug:
12815243" into klp-docs
* commit '
332aefe931fe38291fa07fe20c9018eed1c8c0d5':
docs: Fixed ViewPager animation tutorial. Bug:
12815243
Ricardo Cervera [Mon, 10 Feb 2014 17:26:19 +0000 (17:26 +0000)]
am
d038afd3: am
7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug:
12815243" into klp-docs
* commit '
d038afd39874238357a5ca9621921542f57db7a1':
docs: Fixed ViewPager animation tutorial. Bug:
12815243
Ricardo Cervera [Mon, 10 Feb 2014 17:22:23 +0000 (17:22 +0000)]
am
7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug:
12815243" into klp-docs
* commit '
7074f32440a8d6db4512c82e12b9e1c6891a4ce1':
docs: Fixed ViewPager animation tutorial. Bug:
12815243
Ricardo Cervera [Mon, 10 Feb 2014 17:19:28 +0000 (17:19 +0000)]
Merge "docs: Fixed ViewPager animation tutorial. Bug:
12815243" into klp-docs
Griff Hazen [Mon, 10 Feb 2014 16:58:32 +0000 (08:58 -0800)]
Fix ActivityView layout bug.
Child TextureView should be positioned at origin of ActivityView,
with matching width and height. Previously, a container's padding
would be applied twice for example.
Change-Id: Ie0be10614a45aede4207abf986721385d04d8c76
Narayan Kamath [Mon, 10 Feb 2014 16:51:39 +0000 (16:51 +0000)]
Merge "Extended locales in AAPT / AssetManager."
Narayan Kamath [Mon, 10 Feb 2014 16:51:30 +0000 (16:51 +0000)]
Merge "AssetManager support for 3 letter lang/country codes."
Narayan Kamath [Tue, 21 Jan 2014 15:32:36 +0000 (15:32 +0000)]
Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.
This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.
This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.
Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.
Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9
Narayan Kamath [Mon, 20 Jan 2014 13:57:11 +0000 (13:57 +0000)]
AssetManager support for 3 letter lang/country codes.
- 3 letter codes are packed into the existing 32 bit locale
field in ResTable_config
- We introduce new fields for script / variant information.
Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.
Change-Id: I3c2e909ebbebdbbd0ab72a639d531b2b9fdbd9b9
Narayan Kamath [Mon, 10 Feb 2014 13:45:15 +0000 (13:45 +0000)]
am
33a608a0: am
578d4f5f: am
56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '
33a608a0a326d9671bffd6750cb5521d6687cc57':
AArch64: Use long for pointers in RS Java/JNI code
Narayan Kamath [Mon, 10 Feb 2014 13:39:39 +0000 (13:39 +0000)]
am
578d4f5f: am
56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '
578d4f5f50b3b8969125376d696e893dc355faa6':
AArch64: Use long for pointers in RS Java/JNI code
Narayan Kamath [Mon, 10 Feb 2014 13:37:18 +0000 (05:37 -0800)]
am
56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '
56062983f1e07295c812fba0e22ce579a35b6f76':
AArch64: Use long for pointers in RS Java/JNI code
Narayan Kamath [Mon, 10 Feb 2014 13:33:26 +0000 (13:33 +0000)]
Merge "AArch64: Use long for pointers in RS Java/JNI code"
Katie McCormick [Mon, 10 Feb 2014 13:16:42 +0000 (13:16 +0000)]
am
ffc641dd: am
6366dcbd: am
bcc27903: am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3':
Doc update: misc GCM fixes
Dirk Dougherty [Mon, 10 Feb 2014 13:16:38 +0000 (13:16 +0000)]
am
91bdc7d4: am
33331667: am
3f43b646: am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
91bdc7d4bed9e98db0a8d079a993cf90538e2a66':
Doc change: add carousel and spotlight for developer video.
Craig Mautner [Mon, 10 Feb 2014 12:51:24 +0000 (12:51 +0000)]
am
e03ed510: am
4e5b67e6: Queue startActivity params if not yet ready.
* commit '
e03ed51068bcb4253e2fd2a4a3f39a7e580a721a':
Queue startActivity params if not yet ready.
Craig Mautner [Mon, 10 Feb 2014 12:51:19 +0000 (12:51 +0000)]
am
779d204a: am
9ef471f7: Don\'t remove Activities and Tasks until animation done
* commit '
779d204abe6a3922b572822df5cd775ffd5d77e8':
Don't remove Activities and Tasks until animation done
Christopher Tate [Mon, 10 Feb 2014 12:51:15 +0000 (12:51 +0000)]
am
88daefd4: am
379bb6ed: am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
88daefd40767695f7e8a67d1d52dfaac2ab6bdb6':
Use canonical path for /vendor/app
John Spurlock [Mon, 10 Feb 2014 12:51:06 +0000 (12:51 +0000)]
am
cd4cf932: am
6691bfd6: am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
cd4cf932d994c392ca6da21dc32a26d6d467b721':
Example controller app for system ui demo mode.
Jean-Luc Brouillet [Mon, 10 Feb 2014 12:51:01 +0000 (12:51 +0000)]
Dan Sandler [Mon, 10 Feb 2014 12:50:24 +0000 (12:50 +0000)]
am
9e07c1c4: am
6b1f3acd: am
6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '
9e07c1c4f333171bff6e1cf1c4408e5738bcf127':
Make sure to turn off led after pulse()
Colin Cross [Fri, 7 Feb 2014 04:17:48 +0000 (20:17 -0800)]
frameworks/base: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
Katie McCormick [Sat, 8 Feb 2014 18:44:52 +0000 (18:44 +0000)]
am
6366dcbd: am
bcc27903: am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
6366dcbd494afe20912a932bb18faf199e4a1c62':
Doc update: misc GCM fixes
Dirk Dougherty [Sat, 8 Feb 2014 18:44:49 +0000 (18:44 +0000)]
am
33331667: am
3f43b646: am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
3333166738ca1382307bcf61e30adba6bdec83d4':
Doc change: add carousel and spotlight for developer video.
Katie McCormick [Sat, 8 Feb 2014 18:39:07 +0000 (18:39 +0000)]
am
bcc27903: am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba':
Doc update: misc GCM fixes
Dirk Dougherty [Sat, 8 Feb 2014 18:39:01 +0000 (18:39 +0000)]
am
3f43b646: am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
3f43b646294857ea2dbd5e2fba944ee0d4c19657':
Doc change: add carousel and spotlight for developer video.
Katie McCormick [Sat, 8 Feb 2014 18:34:54 +0000 (18:34 +0000)]
am
44085b68: am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
44085b68add3d7583f7832c51409de83655fc4f1':
Doc update: misc GCM fixes
Dirk Dougherty [Sat, 8 Feb 2014 18:34:44 +0000 (18:34 +0000)]
am
7fd4d29e: am
392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '
7fd4d29e847984c02561c7f385bfe0947432012e':
Doc change: add carousel and spotlight for developer video.
Igor Murashkin [Sat, 8 Feb 2014 02:54:03 +0000 (02:54 +0000)]
Merge "camera2: Simplify min frame durations and add available stream configs"
Igor Murashkin [Sat, 8 Feb 2014 02:52:34 +0000 (18:52 -0800)]
camera2: Simplify min frame durations and add available stream configs
Change-Id: I41951c9a50a333e8e47d0ba616c316c065b604e8
Ruben Brunk [Sat, 8 Feb 2014 02:39:22 +0000 (02:39 +0000)]
Merge "camera2: Update hotpixel tags."
Ruben Brunk [Sat, 8 Feb 2014 02:23:50 +0000 (18:23 -0800)]
camera2: Update hotpixel tags.
Change-Id: I6e2931d54a92f3852e8abe8c480f1762c92655ad
Igor Murashkin [Sat, 8 Feb 2014 02:35:49 +0000 (02:35 +0000)]
Merge "camera2: Add tags for querying capabilities of a camera device"
Igor Murashkin [Sat, 8 Feb 2014 02:34:37 +0000 (18:34 -0800)]
camera2: Add tags for querying capabilities of a camera device
Change-Id: I955b514f9fe66205d241cd4072aa6ddf71efb53c
Igor Murashkin [Sat, 8 Feb 2014 02:22:55 +0000 (02:22 +0000)]
Merge "camera2: Add android.scaler.availableInputOutputFormatsMap"
Igor Murashkin [Sat, 8 Feb 2014 02:20:48 +0000 (18:20 -0800)]
camera2: Add android.scaler.availableInputOutputFormatsMap
Change-Id: I2f0000614063f4004aa90ad1846936bf85db0389
Katie McCormick [Sat, 8 Feb 2014 01:58:53 +0000 (01:58 +0000)]
am
f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '
f2fcbff8382b93bd779af546a7dda8f85eba3763':
Doc update: misc GCM fixes
Katie McCormick [Sat, 8 Feb 2014 01:55:43 +0000 (01:55 +0000)]
Merge "Doc update: misc GCM fixes" into klp-docs
Katie McCormick [Sat, 8 Feb 2014 01:36:03 +0000 (17:36 -0800)]
Doc update: misc GCM fixes
Fixes for:
b/
12909231
b/
12887320
b/
12872407
Change-Id: I1fefb41f7ceea2e4e80262834d1c631b6b8daf7e
Ruben Brunk [Sat, 8 Feb 2014 01:33:36 +0000 (17:33 -0800)]
camera3: Update raw color calibration transform tags.
Change-Id: Ic7a8c68e83b3eb257bd15380baad6370c5eb0dbc
Ruben Brunk [Sat, 8 Feb 2014 01:19:27 +0000 (17:19 -0800)]
Fixbuild. Add api update for camera profile tags.
Change-Id: Id25801ee3f17b721c6d5335a8a8d21041bec068f
Ruben Brunk [Sat, 8 Feb 2014 00:58:09 +0000 (16:58 -0800)]
camera3: Add camera profile properties.
Change-Id: I39f6067bb1c05b8b00b0205bb367312112407299
Zhijun He [Sat, 8 Feb 2014 00:36:17 +0000 (00:36 +0000)]
Merge "Camera2: Add OFF_KEEP_STATE mode"
Zhijun He [Sat, 8 Feb 2014 00:13:46 +0000 (16:13 -0800)]
Camera2: Add OFF_KEEP_STATE mode
Change-Id: I8802339a6b6d8a009f3ba790ffad23c0fcbbfa94
Ruben Brunk [Sat, 8 Feb 2014 00:12:46 +0000 (00:12 +0000)]
Merge "camera3: Make blackLevelPattern optional."
Ruben Brunk [Sat, 8 Feb 2014 00:08:38 +0000 (16:08 -0800)]
camera3: Make blackLevelPattern optional.
Change-Id: Ic7b115e9f6361e158e7af13442bb781bbf351cbf
Chris Craik [Fri, 7 Feb 2014 23:58:23 +0000 (15:58 -0800)]
Add shadow casting / global perspective APIs, hidden for now.
Global perspective isn't yet hooked up in rendering.
Change-Id: I64ad272ea5dc523505260ce114f0a6bebdcfe9dc
Zhijun He [Fri, 7 Feb 2014 23:59:42 +0000 (23:59 +0000)]
Merge "Camera2: Update focus distance related tags"
Zhijun He [Fri, 7 Feb 2014 23:44:30 +0000 (15:44 -0800)]
Camera2: Update focus distance related tags
Change-Id: Ib94311c3168802aea2193a282185e0cd70a547cb
Ruben Brunk [Fri, 7 Feb 2014 23:52:45 +0000 (23:52 +0000)]
Merge "camera3: Add camera neutral tag."
Ruben Brunk [Fri, 7 Feb 2014 23:47:10 +0000 (15:47 -0800)]
camera3: Add camera neutral tag.
Change-Id: Ia7e8c444256ce2a587ce708c2e6e951dec9bbdc8
Ruben Brunk [Fri, 7 Feb 2014 23:39:43 +0000 (23:39 +0000)]
Merge "camera3: Update blackLevelPattern tag."
Ruben Brunk [Fri, 7 Feb 2014 23:26:29 +0000 (15:26 -0800)]
camera3: Update blackLevelPattern tag.
Change-Id: Iee29d475c92bec1688de96e7cae54dfaf1eec69d
Craig Mautner [Fri, 7 Feb 2014 23:37:56 +0000 (23:37 +0000)]
am
4e5b67e6: Queue startActivity params if not yet ready.
* commit '
4e5b67e69560ca443d5fb4b78abf56ae948f578c':
Queue startActivity params if not yet ready.
Craig Mautner [Fri, 7 Feb 2014 23:37:53 +0000 (23:37 +0000)]
am
9ef471f7: Don\'t remove Activities and Tasks until animation done
* commit '
9ef471f7f2f59de032d7cb9c3c7241486109979e':
Don't remove Activities and Tasks until animation done
Christopher Tate [Fri, 7 Feb 2014 23:37:03 +0000 (23:37 +0000)]
am
379bb6ed: am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
379bb6ed4ea4de035569b04018f84d7ce95a8036':
Use canonical path for /vendor/app
Christopher Tate [Fri, 7 Feb 2014 23:33:17 +0000 (15:33 -0800)]
am
ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '
ff27e6bc44097485abfde24f396399e5eec9ff6d':
Use canonical path for /vendor/app
Christopher Tate [Fri, 7 Feb 2014 23:30:23 +0000 (23:30 +0000)]
Merge "Use canonical path for /vendor/app"
Craig Mautner [Fri, 7 Feb 2014 23:30:03 +0000 (15:30 -0800)]
Queue startActivity params if not yet ready.
If the ActivityView is not ready when the startActivity method is
called we now save the Intent until the ActivityView is ready.
Fixes bug
12821638.
Change-Id: I30ebb2699963f174cc2d5a3fb77a99ed33a4252b
ztenghui [Fri, 7 Feb 2014 22:09:39 +0000 (22:09 +0000)]
Merge "Add the clipToOutline by just using the clipPathOp"
Derek Sollenberger [Tue, 10 Dec 2013 17:28:58 +0000 (12:28 -0500)]
Removing SkiaColorFilter and inspecting the native object directly.
bug:
10650594
Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
Dianne Hackborn [Fri, 7 Feb 2014 21:56:45 +0000 (21:56 +0000)]
Merge "Battery stats: more events, fixes."
Dianne Hackborn [Fri, 7 Feb 2014 21:01:07 +0000 (13:01 -0800)]
Battery stats: more events, fixes.
Add new history events for top application package and
foreground application packages.
Doing this involved a fair amount of improvement to history
events. The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active. With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.
Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits. These packing structures are changed to work
together correctly.
Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
ztenghui [Thu, 6 Feb 2014 18:33:58 +0000 (10:33 -0800)]
Add the clipToOutline by just using the clipPathOp
Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
Craig Mautner [Fri, 7 Feb 2014 21:11:47 +0000 (13:11 -0800)]
Don't remove Activities and Tasks until animation done
Just like stacks and displays, activities and tasks need to stick
around until animations have completed.
Change-Id: I54fe8f6855d60cbc3a25cbc6e762defd5ac50bf5
John Spurlock [Fri, 7 Feb 2014 21:03:39 +0000 (21:03 +0000)]
am
6691bfd6: am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
6691bfd6462e27af7075a3a46eccce943f0de9dd':
Example controller app for system ui demo mode.
John Spurlock [Fri, 7 Feb 2014 21:01:42 +0000 (13:01 -0800)]
am
cccae25f: Merge "Example controller app for system ui demo mode."
* commit '
cccae25fc7cd3daf68dee3d3ca7665a5ea12f097':
Example controller app for system ui demo mode.
John Spurlock [Fri, 7 Feb 2014 20:58:36 +0000 (20:58 +0000)]
Merge "Example controller app for system ui demo mode."