OSDN Git Service
Paul Duffin [Wed, 12 Feb 2014 22:19:58 +0000 (22:19 +0000)]
am
0741e11c: am
75d67c6a: am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
0741e11c65350aba95df150d52674c2fab41511a':
Improve Parcel's handling of non-primitive arrays
Narayan Kamath [Wed, 12 Feb 2014 22:19:56 +0000 (22:19 +0000)]
am
fc268eca: am
aa98fb51: am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
fc268ecae13f1634054e984a7cc6e325c21f6ab5':
Use size_t* in AssetManager::createIdmap
Dianne Hackborn [Wed, 12 Feb 2014 22:19:53 +0000 (22:19 +0000)]
am
97de064a: am
133f6826: am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
97de064a9a01d2481c47767d7fbb5b7d5482a3aa':
Runtime resource overlay, iteration 2, test cases
Nick Kralevich [Wed, 12 Feb 2014 22:05:30 +0000 (14:05 -0800)]
resolved conflicts for merge of
dd3d95f1 to klp-volantis-dev
Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
Paul Duffin [Wed, 12 Feb 2014 19:23:01 +0000 (19:23 +0000)]
am
75d67c6a: am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
75d67c6aa051392e711fde3b901a4f2c62f983db':
Improve Parcel's handling of non-primitive arrays
Narayan Kamath [Wed, 12 Feb 2014 19:22:56 +0000 (19:22 +0000)]
am
aa98fb51: am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
aa98fb51a8a0148b72e1662cc42102c6547776ce':
Use size_t* in AssetManager::createIdmap
Dianne Hackborn [Wed, 12 Feb 2014 19:22:24 +0000 (19:22 +0000)]
am
133f6826: am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
133f6826e58aa7643858d4e50630103eb01f1815':
Runtime resource overlay, iteration 2, test cases
Nick Kralevich [Wed, 12 Feb 2014 19:05:59 +0000 (11:05 -0800)]
resolved conflicts for merge of
4ad93639 to klp-modular-dev-plus-aosp
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
Scott Main [Wed, 12 Feb 2014 17:12:10 +0000 (17:12 +0000)]
am
aa318b28: am
879592d8: am
bc64716c: am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
aa318b2851042c6f98723446f33469a6545c7294':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Dirk Dougherty [Wed, 12 Feb 2014 17:12:06 +0000 (17:12 +0000)]
am
17f0d48c: am
8b6597bd: am
b6ecc342: am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
17f0d48ccf4ea817308e8cc3958d249bf77c2a2f':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 17:09:06 +0000 (17:09 +0000)]
am
879592d8: am
bc64716c: am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
879592d89a78383a9e3cd29d53357f34337e5f04':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Dirk Dougherty [Wed, 12 Feb 2014 17:09:03 +0000 (17:09 +0000)]
am
8b6597bd: am
b6ecc342: am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
8b6597bd07411ff3037d068dd0ef55d70ff18f18':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 17:06:32 +0000 (17:06 +0000)]
am
bc64716c: am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
bc64716cfb1269d07b64f89c3b46800afa5dc266':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Dirk Dougherty [Wed, 12 Feb 2014 17:06:26 +0000 (17:06 +0000)]
am
b6ecc342: am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
b6ecc342d3e9f355a78a0a10e613bbda31286f3a':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 17:03:26 +0000 (17:03 +0000)]
am
a2739fa7: am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
a2739fa795981f597b044e93a5c552051cfe1c00':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Dirk Dougherty [Wed, 12 Feb 2014 17:03:22 +0000 (17:03 +0000)]
am
37ae7032: am
1654264e: Update generated docs for Google Play Services.
* commit '
37ae70326feebd23cf2b9c5254f1250d5bf3a029':
Update generated docs for Google Play Services.
Scott Main [Wed, 12 Feb 2014 16:59:56 +0000 (16:59 +0000)]
am
a4c5bba0: add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
* commit '
a4c5bba07e121569ab504b2191ee576f09407f5b':
add document about GoogleApiClient and one about GoogleAuthUtil also remove the Authorization document from the Google Services section. bug:
10679818
Scott Main [Sat, 5 Oct 2013 02:08:08 +0000 (19:08 -0700)]
add document about GoogleApiClient and one about GoogleAuthUtil
also remove the Authorization document from the Google Services
section.
bug:
10679818
Change-Id: Ibfade1eca68d89afe30b79d75ca5e38a2b3a84a8
Paul Duffin [Wed, 12 Feb 2014 10:29:41 +0000 (02:29 -0800)]
am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
d562a9b5160b491a9cc884f72651e46d786bdc0a':
Improve Parcel's handling of non-primitive arrays
Paul Duffin [Wed, 12 Feb 2014 10:27:13 +0000 (10:27 +0000)]
Merge "Improve Parcel's handling of non-primitive arrays"
Narayan Kamath [Wed, 12 Feb 2014 09:40:24 +0000 (01:40 -0800)]
am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
f991771f81953f5d355eb905d05a784ed7287016':
Use size_t* in AssetManager::createIdmap
Narayan Kamath [Wed, 12 Feb 2014 09:32:16 +0000 (09:32 +0000)]
Merge "Use size_t* in AssetManager::createIdmap"
Dirk Dougherty [Wed, 12 Feb 2014 03:13:19 +0000 (03:13 +0000)]
am
1654264e: Update generated docs for Google Play Services.
* commit '
1654264edd68adfd4347d12112aa3124f1d0acb9':
Update generated docs for Google Play Services.
Dirk Dougherty [Sat, 8 Feb 2014 03:58:28 +0000 (19:58 -0800)]
Update generated docs for Google Play Services.
Change-Id: I6dab64736cd07b1ffb398d9baab21250552c5e17
Colin Cross [Wed, 12 Feb 2014 02:02:06 +0000 (18:02 -0800)]
Use size_t* in AssetManager::createIdmap
ResTable::createIdmap takes a size_t*, and the idmap command is
passing in a size_t*, make AssetManager::createIdmap take a
size_t*. Should fix the mac build.
Change-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e
Scott Main [Wed, 12 Feb 2014 01:26:35 +0000 (01:26 +0000)]
am
dac4429f: am
08d28f59: am
6d1d2134: am
11bb34da: am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
dac4429f21caffea61b626797afd142db5025e42':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:24:02 +0000 (01:24 +0000)]
am
08d28f59: am
6d1d2134: am
11bb34da: am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
08d28f59bd74ab4109cf5343ef056a8d4b796ef6':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:18:48 +0000 (01:18 +0000)]
am
6d1d2134: am
11bb34da: am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
6d1d21340fe6ca84fdef76dd6f9ba7c315b7a73e':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:15:25 +0000 (01:15 +0000)]
am
11bb34da: am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
11bb34da5f68f70f3350199e3578445d9a1eaae3':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:12:08 +0000 (01:12 +0000)]
am
9854f69f: Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove \'preview\' notice from Drive page" into klp-docs
* commit '
9854f69f75352e473e34410b0b298b7c7f04434a':
add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page
Scott Main [Wed, 12 Feb 2014 01:09:21 +0000 (01:09 +0000)]
Merge "add google cast feature page edit other feature pages for consistent call to action paragraph and remove 'preview' notice from Drive page" into klp-docs
Jeff Brown [Wed, 12 Feb 2014 00:41:49 +0000 (00:41 +0000)]
am
be83e4a0: am
38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)
* commit '
be83e4a08e909b773ffc06a6e59446deadb8af8b':
Add support for injecting events into ActivityContainers. (DO NOT MERGE)
Jeff Brown [Wed, 12 Feb 2014 00:37:24 +0000 (00:37 +0000)]
am
38f96e50: Add support for injecting events into ActivityContainers. (DO NOT MERGE)
* commit '
38f96e5020b3e82b98fe97b0be363a5ad185860f':
Add support for injecting events into ActivityContainers. (DO NOT MERGE)
Dianne Hackborn [Tue, 11 Feb 2014 21:56:21 +0000 (13:56 -0800)]
Fix build.
At least part of what is broken. Other stuff still seems to be.
Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit
32bb5fae353b5bb6275e75952e89c514c7369cee)
Jeff Brown [Tue, 11 Feb 2014 22:32:56 +0000 (14:32 -0800)]
Add support for injecting events into ActivityContainers. (DO NOT MERGE)
Modified ActivityView to inject touch events it receives back into
its activity container. The container then injects the event into
the input system along with the display id of the underlying virtual
display.
Enhanced the input system to support concurrent dispatch of touch
events on multiple displays which is required for this to work.
Change-Id: I9cf1870db3be6f99a52ed9a1e3ceafe42c940093
Griff Hazen [Tue, 11 Feb 2014 21:34:53 +0000 (21:34 +0000)]
am
0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev
* commit '
0ff811db58089e7b4e8fbca4f41be8f20c86ce10':
Add local-only option to Notification (using flag)
Dianne Hackborn [Tue, 11 Feb 2014 21:34:49 +0000 (13:34 -0800)]
am
89492190: Merge "Runtime resource overlay, iteration 2, test cases"
* commit '
89492190b39e301d8203d0a9a9f6b11120c16ecb':
Runtime resource overlay, iteration 2, test cases
Dianne Hackborn [Tue, 11 Feb 2014 21:34:46 +0000 (13:34 -0800)]
am
67754d93: Merge "Runtime resource overlay, iteration 2"
* commit '
67754d93c4bfb2da1831b1dd2b40c12a838b1028':
Runtime resource overlay, iteration 2
Dianne Hackborn [Tue, 11 Feb 2014 21:30:08 +0000 (21:30 +0000)]
Merge "Runtime resource overlay, iteration 2, test cases"
Dianne Hackborn [Tue, 11 Feb 2014 21:29:58 +0000 (21:29 +0000)]
Merge "Runtime resource overlay, iteration 2"
Griff Hazen [Tue, 11 Feb 2014 21:26:53 +0000 (21:26 +0000)]
Merge "Add local-only option to Notification (using flag)" into klp-modular-dev
Dianne Hackborn [Tue, 11 Feb 2014 20:35:50 +0000 (20:35 +0000)]
am
0cd115e1: am
578087e3: Merge "New command line tool \'idmap\'"
* commit '
0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21':
New command line tool 'idmap'
Dianne Hackborn [Tue, 11 Feb 2014 20:32:17 +0000 (12:32 -0800)]
am
578087e3: Merge "New command line tool \'idmap\'"
* commit '
578087e39845a0c9a728ba18963f498d1f69b279':
New command line tool 'idmap'
Dianne Hackborn [Tue, 11 Feb 2014 20:30:07 +0000 (20:30 +0000)]
Merge "New command line tool 'idmap'"
Katie McCormick [Tue, 11 Feb 2014 20:27:33 +0000 (20:27 +0000)]
am
caec59c1: am
d2e6c89a: am
0a96a82b: am
0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs
* commit '
caec59c176444c87fe6fdd58edc1bbc61242eebb':
Doc update: clarify best practices.
Katie McCormick [Tue, 11 Feb 2014 20:23:58 +0000 (20:23 +0000)]
am
d2e6c89a: am
0a96a82b: am
0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs
* commit '
d2e6c89a24b9049c490c551ac49ecc75570fc50e':
Doc update: clarify best practices.
Katie McCormick [Tue, 11 Feb 2014 20:22:00 +0000 (20:22 +0000)]
am
0a96a82b: am
0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs
* commit '
0a96a82bbe153ed2337b67435016d35eb434da16':
Doc update: clarify best practices.
Katie McCormick [Tue, 11 Feb 2014 20:16:26 +0000 (20:16 +0000)]
am
0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs
* commit '
0cb2c76b66bb7c413221fc0c5ea07b7779c97dea':
Doc update: clarify best practices.
Katie McCormick [Tue, 11 Feb 2014 20:13:34 +0000 (20:13 +0000)]
Merge "Doc update: clarify best practices." into klp-docs
Griff Hazen [Tue, 11 Feb 2014 20:00:00 +0000 (12:00 -0800)]
Add local-only option to Notification (using flag)
Change-Id: Ic6d2f3b0cf06b58c0afa2af0fa6b245124424223
Paul Duffin [Mon, 3 Feb 2014 15:02:17 +0000 (15:02 +0000)]
Improve Parcel's handling of non-primitive arrays
Treat arrays other than actual Object arrays (i.e. those whose component type
is actually Object) and the primitive arrays already handled specially by
Parcel as Serializable's.
Issue: 64583
Change-Id: I3ff797f3262e77e4de27f35709bceee5410d1ed4
Narayan Kamath [Tue, 11 Feb 2014 16:34:16 +0000 (16:34 +0000)]
am
8a63c34b: am
3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"
* commit '
8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
Use long to store pointers in GLES_JNI/EGL classes
Narayan Kamath [Tue, 11 Feb 2014 16:34:12 +0000 (16:34 +0000)]
am
860bba68: am
7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
* commit '
860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
Fix in MediaMuxer's JNI code
Narayan Kamath [Tue, 11 Feb 2014 16:34:08 +0000 (16:34 +0000)]
am
5c770dfb: am
b823bd45: Merge "Use long to store pointers in ConsumerIrService"
* commit '
5c770dfba2846ee173d147fd974f8e9f073c1534':
Use long to store pointers in ConsumerIrService
Narayan Kamath [Tue, 11 Feb 2014 16:34:04 +0000 (16:34 +0000)]
am
b90fc64b: am
f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
* commit '
b90fc64b030ee50bda9a0dabb5247660b70d6659':
Use long for pointers in EmojiFactory and PdfDocument
Narayan Kamath [Tue, 11 Feb 2014 16:30:28 +0000 (08:30 -0800)]
am
3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"
* commit '
3aeb629d8251699237e3d067be4fb44ba206626c':
Use long to store pointers in GLES_JNI/EGL classes
Narayan Kamath [Tue, 11 Feb 2014 16:30:25 +0000 (08:30 -0800)]
am
7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
* commit '
7b7726b7982063034667c6a6076cc0b390ede8ce':
Fix in MediaMuxer's JNI code
Narayan Kamath [Tue, 11 Feb 2014 16:30:20 +0000 (08:30 -0800)]
am
b823bd45: Merge "Use long to store pointers in ConsumerIrService"
* commit '
b823bd45600fc339ae2e618d5fe506ace74ada4a':
Use long to store pointers in ConsumerIrService
Narayan Kamath [Tue, 11 Feb 2014 16:30:06 +0000 (08:30 -0800)]
am
f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
* commit '
f44a3f1e00e38b09f70efed3eaf771871435e478':
Use long for pointers in EmojiFactory and PdfDocument
Narayan Kamath [Tue, 11 Feb 2014 15:39:04 +0000 (15:39 +0000)]
Merge "Use long to store pointers in GLES_JNI/EGL classes"
Narayan Kamath [Tue, 11 Feb 2014 14:33:38 +0000 (14:33 +0000)]
Merge "Fix in MediaMuxer's JNI code"
Narayan Kamath [Tue, 11 Feb 2014 14:29:09 +0000 (14:29 +0000)]
Merge "Use long to store pointers in ConsumerIrService"
Narayan Kamath [Tue, 11 Feb 2014 14:07:16 +0000 (14:07 +0000)]
Merge "Use long for pointers in EmojiFactory and PdfDocument"
Narayan Kamath [Tue, 11 Feb 2014 13:47:50 +0000 (13:47 +0000)]
am
5f7c0b1d: am
6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
* commit '
5f7c0b1d80f883fa15f88e0e4d508576a36a45de':
Fix TinyHashMap to use generic hash_type instead of hash_t
Narayan Kamath [Tue, 11 Feb 2014 13:44:37 +0000 (05:44 -0800)]
am
6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
* commit '
6d8b21a84c92904a966d77f3c6c0282e92c2b077':
Fix TinyHashMap to use generic hash_type instead of hash_t
Narayan Kamath [Tue, 11 Feb 2014 13:40:37 +0000 (13:40 +0000)]
Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"
Jeff Brown [Tue, 11 Feb 2014 08:18:34 +0000 (08:18 +0000)]
am
1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev
* commit '
1b51c9cb96fe2a0818289857a016521eed1ec183':
Make SystemService constructor take a Context.
Jeff Brown [Tue, 11 Feb 2014 04:12:02 +0000 (04:12 +0000)]
Merge "Make SystemService constructor take a Context." into klp-modular-dev
Jeff Brown [Tue, 11 Feb 2014 03:47:07 +0000 (19:47 -0800)]
Make SystemService constructor take a Context.
This change simplifies the process of initializing a SystemService
by folding the onCreate() step back into the constructor. It removes
some ambuiguity about what work should happen in the constructor and
should make it possible for services to retain most of their final
fields after refactoring into the new pattern.
Change-Id: I25f41af0321bc01898658ab44b369f9c5d16800b
Katie McCormick [Fri, 7 Feb 2014 22:33:10 +0000 (14:33 -0800)]
Doc update: clarify best practices.
Fix for:
b/
12515292
Change-Id: I1616d41c052582ff6c82b87cd0282cf1d25bb84d
Craig Mautner [Tue, 11 Feb 2014 02:20:15 +0000 (02:20 +0000)]
am
312ba86b: Change task removal sequence
* commit '
312ba86b476fa1d83864a7d465135cc9a4e94ad8':
Change task removal sequence
Craig Mautner [Tue, 11 Feb 2014 01:55:01 +0000 (17:55 -0800)]
Change task removal sequence
- Remove task after removing activity. Removing the task before
removing the activity led to problems when the task was still needed.
- In WindowManager wait for activity manager to remove the task.
Previously was automatically removing the task when the last activity
was removed.
Fixes bug
12957434.
Change-Id: I7f6b1f09a2e2a845f177f337769075c9376f8bdb
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
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"
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.
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: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 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"
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
OSDN Git Service
