OSDN Git Service
Tim Kilbourn [Sat, 8 Mar 2014 01:55:00 +0000 (01:55 +0000)]
am
b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
* commit '
b559b37150d24411f0b5ef102ced8d5acf858a0e':
Dump leanback info in aapt dump badging.
Ying Wang [Sat, 8 Mar 2014 01:54:52 +0000 (01:54 +0000)]
am
74bebf6f: Exclude the host aapt and aidl from PDK build.
* commit '
74bebf6faed2d34814ffc3d46664330ea568f7b2':
Exclude the host aapt and aidl from PDK build.
Tim Kilbourn [Sat, 8 Mar 2014 00:55:47 +0000 (00:55 +0000)]
Merge "Dump leanback info in aapt dump badging." into klp-modular-dev
Tim Kilbourn [Fri, 7 Mar 2014 23:12:50 +0000 (15:12 -0800)]
Dump leanback info in aapt dump badging.
Leanback launcher activities are reported, including the banner.
Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
Ying Wang [Fri, 7 Mar 2014 23:55:14 +0000 (15:55 -0800)]
Exclude the host aapt and aidl from PDK build.
Bug:
13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
Jeff Brown [Fri, 7 Mar 2014 23:39:12 +0000 (23:39 +0000)]
am
01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '
01b5e765e59c14cdfb62f1a8684e9116a46874d2':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Jeff Brown [Fri, 7 Mar 2014 22:15:08 +0000 (22:15 +0000)]
Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
Jeff Brown [Fri, 7 Mar 2014 21:58:47 +0000 (13:58 -0800)]
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.
Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.
Bug:
12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
Marco Nelissen [Fri, 7 Mar 2014 21:46:38 +0000 (21:46 +0000)]
am
34425196: am
ac875878: am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
344251969929dcb37a33a3e3910121458f7dc38f':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:46:35 +0000 (21:46 +0000)]
am
5ef72c30: am
f066adde: am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
5ef72c30847a0b29c35489fef30bc21fe5a5dcfe':
telephony: Add same named operator configuration for some operators
Marco Nelissen [Fri, 7 Mar 2014 21:18:52 +0000 (21:18 +0000)]
am
ac875878: am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
ac87587875f1dfade5e06a82ccc009d0f0170569':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:18:47 +0000 (21:18 +0000)]
am
f066adde: am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
f066adde7a3722deba0226715af695537511271e':
telephony: Add same named operator configuration for some operators
Marco Nelissen [Fri, 7 Mar 2014 21:12:21 +0000 (21:12 +0000)]
am
9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '
9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7':
Make MtpDatabase use libexif instead of libjhead
Vineeta Srivastava [Fri, 7 Mar 2014 21:12:17 +0000 (21:12 +0000)]
am
dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev
* commit '
dbeb0c12950e92a59671f8da7952ddf3486789b4':
telephony: Add same named operator configuration for some operators
Marco Nelissen [Fri, 7 Mar 2014 20:23:29 +0000 (20:23 +0000)]
Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
Vineeta Srivastava [Fri, 7 Mar 2014 20:09:00 +0000 (20:09 +0000)]
Merge "telephony: Add same named operator configuration for some operators" into klp-dev
Sungmin Choi [Fri, 13 Dec 2013 05:50:40 +0000 (14:50 +0900)]
telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.
Bug:
12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
Vineeta Srivastava [Fri, 7 Mar 2014 18:48:17 +0000 (18:48 +0000)]
am
16ed831e: am
3d924f1e: (-s ours) am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
16ed831eb391e1d08050c52579f316ed5505c1e8':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Vineeta Srivastava [Fri, 7 Mar 2014 18:45:11 +0000 (18:45 +0000)]
am
3d924f1e: (-s ours) am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
3d924f1e8d4664d47a1e5e3045ec450a36bb7009':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Mike J. Chen [Fri, 7 Mar 2014 18:44:22 +0000 (18:44 +0000)]
am
b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit '
b8a7dd639eb680e7bcd410f7d3bd16c7ba6872ad':
Add handshake broadcast support
Vineeta Srivastava [Fri, 7 Mar 2014 18:40:53 +0000 (18:40 +0000)]
am
ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit '
ef86ff58178e876f1dfbedd65166cc806f006ba8':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Mike J. Chen [Fri, 7 Mar 2014 18:40:23 +0000 (18:40 +0000)]
Merge "Add handshake broadcast support" into klp-modular-dev
Vineeta Srivastava [Fri, 7 Mar 2014 18:37:42 +0000 (18:37 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
Sungmin Choi [Mon, 16 Dec 2013 07:14:44 +0000 (16:14 +0900)]
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
This reverts commit
119e24f98706cb0a1217b41e7e750b94c1a8941a.
Bug:
12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
Marco Nelissen [Fri, 10 Jan 2014 18:39:27 +0000 (10:39 -0800)]
Make MtpDatabase use libexif instead of libjhead
b/
12203995
Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Leon Scroggins III [Fri, 7 Mar 2014 18:21:54 +0000 (18:21 +0000)]
am
48df72f7: am
74ca3fd3: (-s ours) am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
48df72f7db7456304bde16a6f000fd7d45ba5d13':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:21:52 +0000 (18:21 +0000)]
am
045ed665: am
8e904d56: (-s ours) am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
045ed665197ed3ba0681db173a058a55662cd16a':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:18:35 +0000 (18:18 +0000)]
am
74ca3fd3: (-s ours) am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
74ca3fd34dac9674f61313594e2863ffecd79c7a':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:18:31 +0000 (18:18 +0000)]
am
8e904d56: (-s ours) am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
8e904d565e8a54f755814e9ae062743b8b012731':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:15:23 +0000 (18:15 +0000)]
am
bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
* commit '
bc57651fb510d7b1a2811235f96e711b6be12a12':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516
Dianne Hackborn [Fri, 7 Mar 2014 18:15:19 +0000 (18:15 +0000)]
am
785d764b: Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
* commit '
785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
More on issue #
12031685 (DO NOT MERGE)
Leon Scroggins III [Fri, 7 Mar 2014 18:13:29 +0000 (18:13 +0000)]
Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:
13191516" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 18:12:30 +0000 (18:12 +0000)]
Merge "More on issue #
12031685 (DO NOT MERGE)" into klp-dev
Andy McFadden [Fri, 7 Mar 2014 17:50:09 +0000 (17:50 +0000)]
am
66069adb: am
cda61e95: am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
66069adb9d22f28b48bd4689b592c887c008be52':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:46:42 +0000 (17:46 +0000)]
am
cda61e95: am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:43:40 +0000 (17:43 +0000)]
am
faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '
faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Andy McFadden [Fri, 7 Mar 2014 17:40:39 +0000 (17:40 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Leon Scroggins III [Tue, 14 Jan 2014 20:14:57 +0000 (15:14 -0500)]
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:
13191516
Original CLs below:
In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.
BUG:
11669944
BUG:
11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41
-------------------------------------------------------------------------
Decode file descriptor from the correct offset.
Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.
Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia
BUG:
12807677
BUG:
12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
Narayan Kamath [Fri, 7 Mar 2014 16:11:38 +0000 (16:11 +0000)]
am
51ec4ec5: am
5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit '
51ec4ec51f88d854b182547405e37f3ae74c35bd':
Don't assume that size_t is 32-bit
Narayan Kamath [Fri, 7 Mar 2014 16:11:35 +0000 (16:11 +0000)]
am
6ac6263d: am
28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit '
6ac6263dcc55a4a93647cc1307c901a01c06d89c':
Don't use size_t for variables that store uint32_t value
Narayan Kamath [Fri, 7 Mar 2014 16:11:29 +0000 (16:11 +0000)]
am
cd4874cf: am
d265bcc4: Merge "Inform libcore of time format pref. changes."
* commit '
cd4874cfdc00d17454529b5dca85a487c7c2de77':
Inform libcore of time format pref. changes.
Narayan Kamath [Fri, 7 Mar 2014 16:08:21 +0000 (08:08 -0800)]
am
5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit '
5de03b18ea455c0250cbd01912282f28d8635910':
Don't assume that size_t is 32-bit
Narayan Kamath [Fri, 7 Mar 2014 16:08:18 +0000 (08:08 -0800)]
am
28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit '
28ccb4f7d9bbea65c8cb1807e332a46ef37bc619':
Don't use size_t for variables that store uint32_t value
Narayan Kamath [Fri, 7 Mar 2014 16:08:05 +0000 (08:08 -0800)]
am
d265bcc4: Merge "Inform libcore of time format pref. changes."
* commit '
d265bcc4b555ab75009f8ceb32cc90007a621b41':
Inform libcore of time format pref. changes.
Narayan Kamath [Fri, 7 Mar 2014 16:04:50 +0000 (16:04 +0000)]
Merge "Don't assume that size_t is 32-bit"
Narayan Kamath [Fri, 7 Mar 2014 16:04:27 +0000 (16:04 +0000)]
Merge "Don't use size_t for variables that store uint32_t value"
Chris Wren [Fri, 7 Mar 2014 15:17:49 +0000 (15:17 +0000)]
am
d1862dac: am
111e981d: am
70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '
d1862dac05e4302761c8d741a3286fe5eb6f1174':
use relative positioning for notification actions
Chris Wren [Fri, 7 Mar 2014 15:15:08 +0000 (15:15 +0000)]
am
111e981d: am
70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '
111e981dc7f7d62647d6aa5e6c44cfd13af53608':
use relative positioning for notification actions
Chris Wren [Fri, 7 Mar 2014 15:10:47 +0000 (15:10 +0000)]
am
70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
* commit '
70d5ed269268c1da6169b49b555d7295ac5d6763':
use relative positioning for notification actions
Chris Wren [Fri, 7 Mar 2014 15:08:29 +0000 (15:08 +0000)]
Merge "use relative positioning for notification actions" into klp-dev
Narayan Kamath [Fri, 7 Mar 2014 13:50:03 +0000 (13:50 +0000)]
Merge "Inform libcore of time format pref. changes."
Narayan Kamath [Thu, 19 Dec 2013 14:49:36 +0000 (14:49 +0000)]
Inform libcore of time format pref. changes.
- Introduce a boolean extra for intent TIME_CHANGED that
specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat
Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
Jeff Brown [Fri, 7 Mar 2014 10:43:52 +0000 (10:43 +0000)]
am
840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev
* commit '
840c84749a6066b436db4dc94c3e3929a8440575':
Add config_supportAutoRotation.
Jeff Brown [Fri, 7 Mar 2014 10:43:47 +0000 (10:43 +0000)]
am
7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev
* commit '
7ddc3cec322f0a4968f00c6bdf8e396094e36f5b':
Reorder config.xml constants related to auto-rotation.
Jeff Brown [Fri, 7 Mar 2014 04:40:10 +0000 (04:40 +0000)]
Merge "Add config_supportAutoRotation." into klp-modular-dev
Jeff Brown [Fri, 7 Mar 2014 04:39:05 +0000 (04:39 +0000)]
Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev
Jeff Brown [Fri, 7 Mar 2014 03:13:04 +0000 (19:13 -0800)]
Add config_supportAutoRotation.
On some products, it may not make sense to use the accelerometer
to perform auto-rotation. In that case, the product's config.xml
framework resource overlay should set config_supportAutoRotation
to false.
Setting this to false also disables auto-rotation settings.
Bug:
13211999
Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
Jeff Brown [Fri, 7 Mar 2014 02:16:34 +0000 (18:16 -0800)]
Reorder config.xml constants related to auto-rotation.
Make it a little easier to find all of the relevant resources
in one place. No functional changes.
Bug:
13211999
Change-Id: Ibfe48f48eae282fa09c95138983dab5e979a866c
Dianne Hackborn [Fri, 7 Mar 2014 01:39:11 +0000 (17:39 -0800)]
More on issue #
12031685 (DO NOT MERGE)
Integrate from master:
Fix issue #
13065185: Frequent runtime restarts on launching...
..."Hill Climb Racing" app
A service is in use when it is in the restarting state.
Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
Marco Nelissen [Fri, 7 Mar 2014 01:35:35 +0000 (01:35 +0000)]
am
b2c45abc: am
233e7e9f: am
98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '
b2c45abc1d6f791f254c2cf6affcfc4f564d9cd2':
ExifInterface: fix class load failure
Dianne Hackborn [Fri, 7 Mar 2014 01:35:32 +0000 (01:35 +0000)]
am
c71c901a: am
278fa87c: am
430652c1: Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '
c71c901ad4d33a373efdad4cf97d12f8ca77e089':
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
Marco Nelissen [Fri, 7 Mar 2014 01:31:22 +0000 (01:31 +0000)]
am
233e7e9f: am
98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '
233e7e9f64be5e85196dd959824bce9a69b2fd99':
ExifInterface: fix class load failure
Dianne Hackborn [Fri, 7 Mar 2014 01:31:17 +0000 (01:31 +0000)]
am
278fa87c: am
430652c1: Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '
278fa87cc9a5e08d410c5b1e6c75afcffc22a988':
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
Craig Mautner [Fri, 7 Mar 2014 01:27:53 +0000 (01:27 +0000)]
am
f453f3a1: Merge "Show the keyguard if unsecure window on top" into klp-modular-dev
* commit '
f453f3a1685b14047533429aff15fd2e2ba3d7c9':
Show the keyguard if unsecure window on top
Marco Nelissen [Fri, 7 Mar 2014 01:26:10 +0000 (01:26 +0000)]
am
98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev
* commit '
98a6bcf433fc23c343343b04c57c5a68d0177ac7':
ExifInterface: fix class load failure
Dianne Hackborn [Fri, 7 Mar 2014 01:26:05 +0000 (01:26 +0000)]
am
430652c1: Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
* commit '
430652c1e18c54dc6ae9debedb6394f2f1905903':
Fix issue #
13199860: PRE_BOOT_COMPLETED intent is...
Craig Mautner [Fri, 7 Mar 2014 01:25:50 +0000 (01:25 +0000)]
Merge "Show the keyguard if unsecure window on top" into klp-modular-dev
Marco Nelissen [Fri, 7 Mar 2014 01:16:49 +0000 (01:16 +0000)]
Merge "ExifInterface: fix class load failure" into klp-dev
Dianne Hackborn [Fri, 7 Mar 2014 01:04:50 +0000 (01:04 +0000)]
Merge "Fix issue #
13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev
Will Haldean Brown [Fri, 7 Mar 2014 01:03:19 +0000 (01:03 +0000)]
am
da9a956b: Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev
* commit '
da9a956bd8ea05f7cfffd86a16d395e536960727':
Fix Theme.Micro to not request ActionBar.
Svetoslav [Fri, 7 Mar 2014 00:59:07 +0000 (00:59 +0000)]
am
3cd04c99: am
d2a244f9: am
8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '
3cd04c99aca7d0c7d1a5edf8e0868c76b0725400':
ProgressBar is important for accessibility by default.
Marco Nelissen [Fri, 7 Mar 2014 00:59:03 +0000 (00:59 +0000)]
am
e1af0bd8: am
4f36104f: am
e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '
e1af0bd8588ca2de7084853017928729a793b769':
libexif is now libjhead
Will Haldean Brown [Fri, 7 Mar 2014 00:56:05 +0000 (00:56 +0000)]
Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev
Zhijun He [Fri, 20 Dec 2013 21:28:00 +0000 (13:28 -0800)]
ExifInterface: fix class load failure
libexif_jni was renamed as libjhead_jni
b/
12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
Svetoslav [Fri, 7 Mar 2014 00:47:17 +0000 (00:47 +0000)]
am
d2a244f9: am
8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '
d2a244f9767ee678d3971c9ad43a07100db4e8c9':
ProgressBar is important for accessibility by default.
Marco Nelissen [Fri, 7 Mar 2014 00:47:02 +0000 (00:47 +0000)]
am
4f36104f: am
e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '
4f36104f06755dc2c95b3d7c8bac5312d7572199':
libexif is now libjhead
Jay Shrauner [Fri, 7 Mar 2014 00:45:06 +0000 (00:45 +0000)]
am
d96e021a: am
1276295b: (-s ours) am
a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit '
d96e021a9ef03b4bbcf061723e303805919ae35c':
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Jay Shrauner [Fri, 7 Mar 2014 00:39:49 +0000 (00:39 +0000)]
am
1276295b: (-s ours) am
a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit '
1276295b6b157b583480fbdf2be72b9bc0fb1c54':
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Svetoslav [Fri, 7 Mar 2014 00:39:05 +0000 (00:39 +0000)]
am
8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '
8cb232cb796718ad91e56672a2c8fdbf88633001':
ProgressBar is important for accessibility by default.
Marco Nelissen [Fri, 7 Mar 2014 00:38:48 +0000 (00:38 +0000)]
am
e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '
e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
libexif is now libjhead
Svetoslav [Fri, 7 Mar 2014 00:37:14 +0000 (00:37 +0000)]
Merge "ProgressBar is important for accessibility by default." into klp-dev
Marco Nelissen [Fri, 7 Mar 2014 00:34:36 +0000 (00:34 +0000)]
Merge "libexif is now libjhead" into klp-dev
Will Haldean Brown [Fri, 7 Mar 2014 00:14:44 +0000 (16:14 -0800)]
Fix Theme.Micro to not request ActionBar.
This led to a crash for apps that use Theme.DeviceDefault, because it
requests both actionbar and swipe-to-dismiss.
Bug:
13348329
Change-Id: Iabc95600b19d842d02df4e92ab32327328f99be5
Marco Nelissen [Thu, 19 Dec 2013 22:21:19 +0000 (14:21 -0800)]
libexif is now libjhead
b/
12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
Jay Shrauner [Fri, 7 Mar 2014 00:00:14 +0000 (00:00 +0000)]
am
a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit '
a3ea4be5425fc2a561290c08a9f5f31f374afc31':
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Leon Scroggins III [Thu, 6 Mar 2014 22:45:26 +0000 (22:45 +0000)]
am
a4d7259c: am
87e9e744: (-s ours) am
92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '
a4d7259c8246a07666f732b5e9fd12280b611d2e':
DO NOT MERGE - Fix Javadoc build break.
Jay Shrauner [Fri, 7 Feb 2014 21:28:59 +0000 (13:28 -0800)]
Prevent SpellChecker from setting invalid range - DO NOT MERGE
Add check for invalid range before setting for further check
at end of parse() loop.
Bug:
12936072
Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
(cherry picked from commit
ea4adf28474d949c51518a5abe6dbd3a3529cf29)
Takahiro Aizawa [Wed, 11 Dec 2013 10:22:26 +0000 (19:22 +0900)]
EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in
0fa257fe53bf520bdde93996a1901ce6bc3e1788
Bug
13226025
(cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)
Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a
Leon Scroggins III [Thu, 6 Mar 2014 22:09:41 +0000 (22:09 +0000)]
am
87e9e744: (-s ours) am
92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '
87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
DO NOT MERGE - Fix Javadoc build break.
Leon Scroggins III [Thu, 6 Mar 2014 21:31:31 +0000 (21:31 +0000)]
am
92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '
92a3283286df3a6c2a27ecde8eddf23abbb87de9':
DO NOT MERGE - Fix Javadoc build break.
Leon Scroggins III [Thu, 6 Mar 2014 21:30:53 +0000 (21:30 +0000)]
am
337a2003: am
8d3281f5: (-s ours) am
ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
* commit '
337a200361482c046fb695f46b1052aa3c85db57':
Update framework to use M33 Skia. DO NOT MERGE
Eric Laurent [Thu, 6 Mar 2014 21:30:49 +0000 (21:30 +0000)]
am
3260f254: am
eac19754: am
617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '
3260f254459fab42fb23389088da0eb73e0e0969':
Fix RemoteController synchronization mode
Dianne Hackborn [Thu, 6 Mar 2014 21:30:47 +0000 (21:30 +0000)]
am
76e1d769: am
12caef78: (-s ours) am
71ab245a: Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
* commit '
76e1d76948c68f9414a9ca0271ea9dfb6da40191':
Fix issue #
11536426 DO NOT MERGE
Santos Cordon [Thu, 6 Mar 2014 21:30:45 +0000 (21:30 +0000)]
am
59999040: am
abbd963e: (-s ours) am
4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit '
5999904094865f27febb7588f1a40b5561ef8d4b':
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
Leon Scroggins III [Wed, 15 Jan 2014 19:23:14 +0000 (14:23 -0500)]
DO NOT MERGE - Fix Javadoc build break.
Remove links to non-specific function name.
Bug:
13246311
Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit
2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
Leon Scroggins III [Thu, 6 Mar 2014 20:06:14 +0000 (20:06 +0000)]
am
8d3281f5: (-s ours) am
ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
* commit '
8d3281f5f7a880b996e50d291ebb7154a486eb6c':
Update framework to use M33 Skia. DO NOT MERGE
Eric Laurent [Thu, 6 Mar 2014 20:06:08 +0000 (20:06 +0000)]
am
eac19754: am
617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
* commit '
eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
Fix RemoteController synchronization mode
Dianne Hackborn [Thu, 6 Mar 2014 20:06:05 +0000 (20:06 +0000)]
am
12caef78: (-s ours) am
71ab245a: Merge "Fix issue #
11536426 DO NOT MERGE" into klp-dev
* commit '
12caef7836a21fa20d052e4868df92e23b930cf6':
Fix issue #
11536426 DO NOT MERGE
Santos Cordon [Thu, 6 Mar 2014 20:06:02 +0000 (20:06 +0000)]
am
abbd963e: (-s ours) am
4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
* commit '
abbd963e3c50f5241f9bf668b8b806c42a202621':
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
Chris Wren [Tue, 3 Dec 2013 19:31:01 +0000 (14:31 -0500)]
use relative positioning for notification actions
Bug:
10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d