OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:07:54 +0000 (02:07 +0000)]
am 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
  Import translations. DO NOT MERGE

10 years agoam 2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:07:51 +0000 (02:07 +0000)]
am 2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '2d6e077d1db0da9a008ff6014ebbb555c30a7c47':
  Import translations. DO NOT MERGE

10 years agoam 42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:07:48 +0000 (02:07 +0000)]
am 42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '42c0488a4b4db802161dc60a0bd16d2e5bc6afbe':
  Import translations. DO NOT MERGE

10 years agoam 9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:07:45 +0000 (02:07 +0000)]
am 9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '9dbd2eebf9095c4513b333a1ccce12e7d4523bd1':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:49 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:47 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:43 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:41 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoam 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
Jeff Brown [Wed, 23 Apr 2014 01:22:26 +0000 (01:22 +0000)]
am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev

* commit '3af392674969b17cd3719f49ae597c7dc6ee6614':
  Fix HDMI hotplug display blanking behavior.

10 years agoMerge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
Jeff Brown [Wed, 23 Apr 2014 01:20:01 +0000 (01:20 +0000)]
Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev

10 years agoFix HDMI hotplug display blanking behavior.
Jeff Brown [Wed, 23 Apr 2014 01:07:24 +0000 (18:07 -0700)]
Fix HDMI hotplug display blanking behavior.

Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 00:12:07 +0000 (17:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iae8e8f588200714d11fe7dced5aab7ec63181e8f
Auto-generated-cl: translation import

10 years agoam d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class...
Ying Wang [Wed, 23 Apr 2014 00:11:52 +0000 (00:11 +0000)]
am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev

* commit 'd0dc898119fc43de89ff41e39d37961dacab4eaa':
  Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 00:11:22 +0000 (17:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idf24bec3b74bbe1abc88c2a3c2da451be9ed5c02
Auto-generated-cl: translation import

10 years agoMerge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into...
Ying Wang [Wed, 23 Apr 2014 00:10:01 +0000 (00:10 +0000)]
Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 00:09:18 +0000 (17:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3106f51a639078291c298ca4bbd75062e788a313
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 00:08:37 +0000 (17:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1aa31fe5b005c2cdef0b250806d682141cdf4fc3
Auto-generated-cl: translation import

10 years agoam cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods."
Deepanshu Gupta [Tue, 22 Apr 2014 23:15:05 +0000 (23:15 +0000)]
am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods."

* commit 'cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f':
  Add missing ICU_Delegate methods.

10 years agoam 53b7df19: Merge "Add missing ICU_Delegate methods."
Deepanshu Gupta [Tue, 22 Apr 2014 23:10:40 +0000 (23:10 +0000)]
am 53b7df19: Merge "Add missing ICU_Delegate methods."

* commit '53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330':
  Add missing ICU_Delegate methods.

10 years agoMerge "Add missing ICU_Delegate methods."
Deepanshu Gupta [Tue, 22 Apr 2014 23:08:05 +0000 (23:08 +0000)]
Merge "Add missing ICU_Delegate methods."

10 years agoam df64ac68: ask skia to use flat gamma when rendering fonts from hwui
Victoria Lease [Tue, 22 Apr 2014 22:57:29 +0000 (22:57 +0000)]
am df64ac68: ask skia to use flat gamma when rendering fonts from hwui

* commit 'df64ac688d400c74438db091952d236fffd5f778':
  ask skia to use flat gamma when rendering fonts from hwui

10 years agoask skia to use flat gamma when rendering fonts from hwui
Victoria Lease [Tue, 22 Apr 2014 22:00:31 +0000 (15:00 -0700)]
ask skia to use flat gamma when rendering fonts from hwui

Bug: 13748392
Change-Id: I6930629b8e900628f15354f663b86dfb29a4db78
(cherry picked from commit b66270eac288de53207e55d10879b070a0ec8b6b)

10 years agoJavac (at least for 1.7.0_51 on Mac) wants fully qualified class name
Ying Wang [Tue, 22 Apr 2014 22:20:16 +0000 (15:20 -0700)]
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name

It looks like a Javac bug.

Bug: 14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392

10 years agoam 5246f459: am d267c1a0: Merge "remove unneeded import statements."
Nick Kralevich [Tue, 22 Apr 2014 21:15:10 +0000 (21:15 +0000)]
am 5246f459: am d267c1a0: Merge "remove unneeded import statements."

* commit '5246f4599a0c9978012ffb1049307704b5027a0b':
  remove unneeded import statements.

10 years agoam 3ab7882a: am a67d4a6e: Merge "remove unused import."
Nick Kralevich [Tue, 22 Apr 2014 21:14:59 +0000 (21:14 +0000)]
am 3ab7882a: am a67d4a6e: Merge "remove unused import."

* commit '3ab7882a57d3c7a0e13f58837cd02138df43f301':
  remove unused import.

10 years agoam d267c1a0: Merge "remove unneeded import statements."
Nick Kralevich [Tue, 22 Apr 2014 19:52:21 +0000 (19:52 +0000)]
am d267c1a0: Merge "remove unneeded import statements."

* commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
  remove unneeded import statements.

10 years agoam a67d4a6e: Merge "remove unused import."
Nick Kralevich [Tue, 22 Apr 2014 19:52:18 +0000 (19:52 +0000)]
am a67d4a6e: Merge "remove unused import."

* commit 'a67d4a6e4da1eb02a15a1048a26329cfed312938':
  remove unused import.

10 years agoMerge "remove unneeded import statements."
Nick Kralevich [Tue, 22 Apr 2014 19:24:47 +0000 (19:24 +0000)]
Merge "remove unneeded import statements."

10 years agoMerge "remove unused import."
Nick Kralevich [Tue, 22 Apr 2014 19:23:30 +0000 (19:23 +0000)]
Merge "remove unused import."

10 years agoremove unneeded import statements.
Nick Kralevich [Tue, 22 Apr 2014 19:17:51 +0000 (12:17 -0700)]
remove unneeded import statements.

Internal master is out of sync with AOSP. Resync.

Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e

10 years agoremove unused import.
Nick Kralevich [Tue, 22 Apr 2014 19:10:24 +0000 (12:10 -0700)]
remove unused import.

This change resynchronizes AOSP with internal master.
The import line is unused.

Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e

10 years agoam 3b9a3cc0: Update GlobalActions for watches.
Justin Koh [Tue, 22 Apr 2014 17:06:56 +0000 (17:06 +0000)]
am 3b9a3cc0: Update GlobalActions for watches.

* commit '3b9a3cc02ecb025f8b1f322015c7d1fb46222f9e':
  Update GlobalActions for watches.

10 years agoUpdate GlobalActions for watches.
Justin Koh [Tue, 22 Apr 2014 00:50:40 +0000 (17:50 -0700)]
Update GlobalActions for watches.

Update GlobalActions for watches: only have power off and settings, due to
limited real estate.

Change-Id: Ie3cbbb287f8c71c8c16a00637c83da6921d56e2e

10 years agoam 04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 22 Apr 2014 14:49:14 +0000 (14:49 +0000)]
am 04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '04acf38ce281f86bd0f28485405c59e489657dfb':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 22 Apr 2014 14:46:28 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoam da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sample.
Andrew Solovay [Tue, 22 Apr 2014 13:36:44 +0000 (13:36 +0000)]
am da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sample.

* commit 'da1a10f727746f9f85c576adb2c4c91c552255f3':
  Fixed a typo in a code sample.

10 years agoam 6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev
Guang Zhu [Tue, 22 Apr 2014 13:27:56 +0000 (13:27 +0000)]
am 6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev

* commit '6c0454ecae4fe46b7032299d02fc6da80f171ed2':
  add bt instrumentation to run as a util

10 years agoam 6985badc: Fix black ActivityView
Craig Mautner [Tue, 22 Apr 2014 13:27:53 +0000 (13:27 +0000)]
am 6985badc: Fix black ActivityView

* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
  Fix black ActivityView

10 years agoam 6cdf51f2: Don\'t use finalize on ActivityView to cleanup.
Craig Mautner [Tue, 22 Apr 2014 13:27:49 +0000 (13:27 +0000)]
am 6cdf51f2: Don\'t use finalize on ActivityView to cleanup.

* commit '6cdf51f21df1ca2397618635767e6e53a65799ad':
  Don't use finalize on ActivityView to cleanup.

10 years agoam f4c909bc: Fix ActivityView lifecycle
Craig Mautner [Tue, 22 Apr 2014 13:27:44 +0000 (13:27 +0000)]
am f4c909bc: Fix ActivityView lifecycle

* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle

10 years agoam c68e2089: am 3555e4ae: Fixed a typo in a code sample.
Andrew Solovay [Tue, 22 Apr 2014 13:27:09 +0000 (13:27 +0000)]
am c68e2089: am 3555e4ae: Fixed a typo in a code sample.

* commit 'c68e2089755dc35b34d620944bcceb63e1283015':
  Fixed a typo in a code sample.

10 years agoam 3555e4ae: Fixed a typo in a code sample.
Andrew Solovay [Tue, 22 Apr 2014 13:20:44 +0000 (13:20 +0000)]
am 3555e4ae: Fixed a typo in a code sample.

* commit '3555e4aef0d5664645e35d33779bf1bd140a7e50':
  Fixed a typo in a code sample.

10 years agoMerge "add bt instrumentation to run as a util" into klp-modular-dev
Guang Zhu [Tue, 22 Apr 2014 03:33:47 +0000 (03:33 +0000)]
Merge "add bt instrumentation to run as a util" into klp-modular-dev

10 years agoadd bt instrumentation to run as a util
Guang Zhu [Tue, 22 Apr 2014 02:06:17 +0000 (19:06 -0700)]
add bt instrumentation to run as a util

some bt test util methods are useful as device setup util, this
change exposes some of them via a BluetoothInstrumentation so
that they can be invoked like commands for setting up or
controlling bt state in test harness

Change-Id: I1d40baf374e145ab550ae4fa5f581e2eaf2e29bb

10 years agoFixed a typo in a code sample.
Andrew Solovay [Mon, 21 Apr 2014 20:30:10 +0000 (13:30 -0700)]
Fixed a typo in a code sample.

Fix is staged to: http://asolovay.mtv.corp.google.com:9000/guide/topics/ui/actionbar.html#Dropdown

Bug: 14043905

Change-Id: I8b71d55d51bf88ab9790309e6e63e755d03b2c85

10 years agoFix black ActivityView
Craig Mautner [Mon, 21 Apr 2014 22:22:06 +0000 (15:22 -0700)]
Fix black ActivityView

Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2

10 years agoDon't use finalize on ActivityView to cleanup.
Craig Mautner [Sat, 19 Apr 2014 21:56:31 +0000 (14:56 -0700)]
Don't use finalize on ActivityView to cleanup.

Use a static object to contain the IActivityContainer reference
rather than storing it directly in the ActivityView itself. Then
when the ActivityView gives up the reference we can use a clean
finalize() call to release the IActivityContainer.

Fixes bug 14184756.

Change-Id: I7e05fcce3040b2b958f7c9cd030d5e3b745f3169

10 years agoFix ActivityView lifecycle
Craig Mautner [Fri, 18 Apr 2014 01:39:38 +0000 (18:39 -0700)]
Fix ActivityView lifecycle

Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8

10 years agoAdd missing ICU_Delegate methods.
Deepanshu Gupta [Mon, 21 Apr 2014 21:33:33 +0000 (14:33 -0700)]
Add missing ICU_Delegate methods.

Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2

Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77

10 years agoam 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
Jeff Tinker [Mon, 21 Apr 2014 21:02:28 +0000 (21:02 +0000)]
am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev

* commit '72eec7f6c9509fb86f46fbdb619523efacb8d02e':
  Allow DRM plugins to be destroyed when released

10 years agoMerge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
Jeff Tinker [Mon, 21 Apr 2014 20:58:49 +0000 (20:58 +0000)]
Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev

10 years agoam 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev
Adam Lesinski [Mon, 21 Apr 2014 20:21:13 +0000 (20:21 +0000)]
am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev

* commit '370cda7074a02139fa5374bbdd94c37be376ca7a':
  Allow InputEvents to propagate w/o IME

10 years agoMerge "Allow InputEvents to propagate w/o IME" into klp-modular-dev
Adam Lesinski [Mon, 21 Apr 2014 20:18:11 +0000 (20:18 +0000)]
Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev

10 years agoam 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is...
Jesse Hall [Mon, 21 Apr 2014 19:46:01 +0000 (19:46 +0000)]
am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

* commit '650a8860d9732accd938a32f99179cc86f101ef4':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.

10 years agoam fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
Jesse Hall [Mon, 21 Apr 2014 19:41:29 +0000 (19:41 +0000)]
am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

* commit 'fc3c6a0ef36cc4969aa7d8e160cc55f30c653325':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.

10 years agoMerge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
Jesse Hall [Mon, 21 Apr 2014 19:38:45 +0000 (19:38 +0000)]
Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

10 years agoam fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete...
Ariel Gertzenstein [Mon, 21 Apr 2014 18:47:40 +0000 (18:47 +0000)]
am fe755054: Merge "DO NOT MERGE    Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev

* commit 'fe7550548d036b6c536840fd1daa954160d0b2c8':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.

10 years agoMerge "DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request...
Ariel Gertzenstein [Mon, 21 Apr 2014 18:41:53 +0000 (18:41 +0000)]
Merge "DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev

10 years agoDO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request
Ariel Gertzenstein [Thu, 3 Apr 2014 03:36:57 +0000 (20:36 -0700)]
DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 21 Apr 2014 18:19:33 +0000 (11:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ieb3e0b6128807111d32faa3681839723fd47e8f1
Auto-generated-cl: translation import

10 years agoam eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
Mike Lockwood [Mon, 21 Apr 2014 16:44:49 +0000 (16:44 +0000)]
am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail

* commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e':
  MTP: Fix getThumbnail

10 years agoam ca1f8f6d: am c4367721: MTP: Fix getThumbnail
Mike Lockwood [Mon, 21 Apr 2014 16:40:18 +0000 (16:40 +0000)]
am ca1f8f6d: am c4367721: MTP: Fix getThumbnail

* commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521':
  MTP: Fix getThumbnail

10 years agoam c4367721: MTP: Fix getThumbnail
Mike Lockwood [Mon, 21 Apr 2014 16:31:51 +0000 (16:31 +0000)]
am c4367721: MTP: Fix getThumbnail

* commit 'c436772120ceea1d6e3f5b388ef068c99c8bb7d6':
  MTP: Fix getThumbnail

10 years agoMTP: Fix getThumbnail
Mike Lockwood [Mon, 21 Apr 2014 15:49:30 +0000 (08:49 -0700)]
MTP: Fix getThumbnail

The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.

Bug: 13747419

Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5

10 years agoam 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
Ying Wang [Mon, 21 Apr 2014 13:45:33 +0000 (13:45 +0000)]
am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."

* commit '9df9ad7e29aecf88fdeb026bda07963ab6789396':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

10 years agoam 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
Ying Wang [Mon, 21 Apr 2014 13:35:26 +0000 (13:35 +0000)]
am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."

* commit '2a52862db5257edcafa137276ce3d8dc54cd443e':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

10 years agoMerge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
Ying Wang [Sat, 19 Apr 2014 00:07:49 +0000 (00:07 +0000)]
Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."

10 years agoam 0090082e: resolved conflicts for merge of 89a086c1 to klp-modular-dev
Kenny Root [Sat, 19 Apr 2014 00:02:04 +0000 (00:02 +0000)]
am 0090082e: resolved conflicts for merge of 89a086c1 to klp-modular-dev

* commit '0090082ed040dd3ea897cf13d7e837dadd06ca3f':
  Use hidden API to validate APK chains

10 years agoUse LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Ying Wang [Fri, 18 Apr 2014 01:14:50 +0000 (18:14 -0700)]
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2

10 years agoam cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer...
Elliott Hughes [Fri, 18 Apr 2014 23:26:16 +0000 (23:26 +0000)]
am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."

* commit 'cf4d85e4786beb98743eac68b71d67e36f76c058':
  Fix warning introduced by recent psuedolocalizer change.

10 years agoam 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."
Elliott Hughes [Fri, 18 Apr 2014 23:20:21 +0000 (23:20 +0000)]
am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."

* commit '90840ec29dec173f5fbc8197bcf1889bde5bd262':
  Fix warning introduced by recent psuedolocalizer change.

10 years agoMerge "Fix warning introduced by recent psuedolocalizer change."
Elliott Hughes [Fri, 18 Apr 2014 23:16:43 +0000 (23:16 +0000)]
Merge "Fix warning introduced by recent psuedolocalizer change."

10 years agoFix warning introduced by recent psuedolocalizer change.
Elliott Hughes [Fri, 18 Apr 2014 23:15:27 +0000 (16:15 -0700)]
Fix warning introduced by recent psuedolocalizer change.

Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d

10 years agoresolved conflicts for merge of 89a086c1 to klp-modular-dev
Kenny Root [Fri, 18 Apr 2014 23:15:13 +0000 (16:15 -0700)]
resolved conflicts for merge of 89a086c1 to klp-modular-dev

Change-Id: Iaa82bfc87fb3af2e8e78597c6f2517e7dad7c130

10 years agoam cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am...
Kenny Root [Fri, 18 Apr 2014 23:05:30 +0000 (23:05 +0000)]
am cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit 'cf677a37fb4560058fe29ebcac97f2c02bd55064':
  Use hidden API to validate APK chains

10 years agoam e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am...
Kenny Root [Fri, 18 Apr 2014 23:00:37 +0000 (23:00 +0000)]
am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit 'e00c9185262c675f1680920c258413299995042a':
  Use hidden API to validate APK chains

10 years agoresolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp
Elliott Hughes [Fri, 18 Apr 2014 22:56:46 +0000 (15:56 -0700)]
resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp

Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94

10 years agoam 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am...
Kenny Root [Fri, 18 Apr 2014 22:56:26 +0000 (22:56 +0000)]
am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
  Use hidden API to validate APK chains

10 years agoam 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am...
Kenny Root [Fri, 18 Apr 2014 22:50:12 +0000 (22:50 +0000)]
am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
  Use hidden API to validate APK chains

10 years agoam 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am...
Kenny Root [Fri, 18 Apr 2014 22:43:08 +0000 (22:43 +0000)]
am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '5a0cc78929bf56c153696ffa16b602acfcc40089':
  Use hidden API to validate APK chains

10 years agoam 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am...
Kenny Root [Fri, 18 Apr 2014 22:37:38 +0000 (22:37 +0000)]
am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
  Use hidden API to validate APK chains

10 years agoam 92b2d5a6: Merge "Pseudolocalizer improvements."
Elliott Hughes [Fri, 18 Apr 2014 22:36:32 +0000 (22:36 +0000)]
am 92b2d5a6: Merge "Pseudolocalizer improvements."

* commit '92b2d5a608f9fefc9a88eea03cd599a26c1b62ce':
  Pseudolocalizer improvements.

10 years agoMerge "Pseudolocalizer improvements."
Elliott Hughes [Fri, 18 Apr 2014 22:32:53 +0000 (22:32 +0000)]
Merge "Pseudolocalizer improvements."

10 years agoam 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge...
Kenny Root [Fri, 18 Apr 2014 22:31:08 +0000 (22:31 +0000)]
am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '47231936c0593b87c3c9898767327f1516a7ec22':
  Use hidden API to validate APK chains

10 years agoam 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden...
Kenny Root [Fri, 18 Apr 2014 22:26:03 +0000 (22:26 +0000)]
am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '02bc4b04239c437f88fdb82633b41cdc8a8eff6b':
  Use hidden API to validate APK chains

10 years agoam 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate...
Kenny Root [Fri, 18 Apr 2014 22:21:37 +0000 (22:21 +0000)]
am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '4a62a6dce9a4b48f1c1c64e47a22d2319b852acd':
  Use hidden API to validate APK chains

10 years agoam 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains...
Kenny Root [Fri, 18 Apr 2014 22:14:14 +0000 (22:14 +0000)]
am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '451ed5f077b9f95deae809ae620bc210c253b922':
  Use hidden API to validate APK chains

10 years agoAllow InputEvents to propagate w/o IME
Adam Lesinski [Mon, 28 Oct 2013 23:03:19 +0000 (16:03 -0700)]
Allow InputEvents to propagate w/o IME

If no IME was present, InputEvents such as KeyEvents
would simple be dropped instead of going through
to the Activity's View hierarchy.

Change-Id: I9de25bdbf5d1564b77b25679e19dae18591a8c1c

10 years agoam 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
Kenny Root [Fri, 18 Apr 2014 21:33:04 +0000 (21:33 +0000)]
am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit '3ecaa88d83d04a0fd55b494829badbb41016f5a1':
  Use hidden API to validate APK chains

10 years agoam d5ed804f: am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes...
Ricardo Cervera [Fri, 18 Apr 2014 19:16:27 +0000 (19:16 +0000)]
am d5ed804f: am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs

* commit 'd5ed804f6fcbbdfb26da2289053e15802191aba8':
  docs: Watermarked images for codes that weren't found.

10 years agoam fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with...
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:16:23 +0000 (19:16 +0000)]
am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs

* commit 'fed2c410ab09de72931bc95380645a62746273bc':
  Revert "docs: Watermark images with easter eggs"

10 years agoam a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t...
Ricardo Cervera [Fri, 18 Apr 2014 19:12:59 +0000 (19:12 +0000)]
am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs

* commit 'a7b6271820e464b3aae955013b25f5b04f3ff9e1':
  docs: Watermarked images for codes that weren't found.

10 years agoam 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs...
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:12:53 +0000 (19:12 +0000)]
am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs

* commit '4874938ad3fb0d0ab56b24cb18c8943a72559f12':
  Revert "docs: Watermark images with easter eggs"

10 years agoam 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into...
Ricardo Cervera [Fri, 18 Apr 2014 19:08:09 +0000 (19:08 +0000)]
am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs

* commit '974588d149812ee5420f55e3fd3182045b1e915b':
  docs: Watermarked images for codes that weren't found.

10 years agoam 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:08:05 +0000 (19:08 +0000)]
am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs

* commit '84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
  Revert "docs: Watermark images with easter eggs"

10 years agoMerge "docs: Watermarked images for codes that weren't found." into klp-docs
Ricardo Cervera [Fri, 18 Apr 2014 19:02:04 +0000 (19:02 +0000)]
Merge "docs: Watermarked images for codes that weren't found." into klp-docs

10 years agoMerge "Revert "docs: Watermark images with easter eggs"" into klp-docs
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:01:48 +0000 (19:01 +0000)]
Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs

10 years agodocs: Watermarked images for codes that weren't found.
Ricardo Cervera [Fri, 18 Apr 2014 18:54:03 +0000 (11:54 -0700)]
docs: Watermarked images for codes that weren't found.

Details:

Line 84
http://goo.gl/1QTi2T
http://developer.android.com/design/get-started/ui-overview.html
http://developer.android.com/design/media/ui_overview_notifications.png

Line 81
http://goo.gl/bHjQsk
http://developer.android.com/design/style/touch-feedback.html
http://developer.android.com/design/media/touch_feedback_communication.png

Line 76
http://goo.gl/HGUj4v
http://developer.android.com/design/patterns/navigation-drawer.html
http://developer.android.com/design/media/navigation_drawer_titles_icons.png

Line 11
http://goo.gl/yYQniH
http://developer.android.com/design/patterns/selection.html
http://developer.android.com/design/media/selection_adjusting_actions.png

Line 10
http://goo.gl/M2QJa7
http://developer.android.com/design/building-blocks/dialogs.html
http://developer.android.com/design/media/dialogs_examples.png

Change-Id: I5df9288b97a9ca58df9f596ae6624c5c91911b3a

10 years agoRevert "docs: Watermark images with easter eggs"
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 18:34:41 +0000 (18:34 +0000)]
Revert "docs: Watermark images with easter eggs"

This reverts commit dc9ca02c51ecc4468e60c391f8357b5025d6eef1.

Change-Id: Idf4873e2e76d746c227c89c2f84fe44946014752

10 years agoam ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
Kenny Root [Fri, 18 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

* commit 'ecb013dbff5e33b95c49015fa375579e055911ae':
  Use hidden API to validate APK chains