Craig Mautner
f453f3a168
Merge "Show the keyguard if unsecure window on top" into klp-modular-dev
2014-03-07 01:25:50 +00:00
Marco Nelissen
98a6bcf433
Merge "ExifInterface: fix class load failure" into klp-dev
2014-03-07 01:16:50 +00:00
Dianne Hackborn
430652c1e1
Merge "Fix issue #13199860 : PRE_BOOT_COMPLETED intent is..." into klp-dev
2014-03-07 01:04:50 +00:00
Will Haldean Brown
9550ac44a4
am d7b5caab: am da9a956b: Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev
...
* commit 'd7b5caabfec09a617ebbdec3d566f0be061f516c':
Fix Theme.Micro to not request ActionBar.
2014-03-07 01:04:36 +00:00
Svetoslav
c4fce60cd3
am b28f8730: am 3cd04c99: am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
...
* commit 'b28f87301fbb4f7db0b195c210af8006a321a030':
ProgressBar is important for accessibility by default.
2014-03-07 01:04:33 +00:00
Marco Nelissen
4bf85e84e9
am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
...
* commit 'daefb17c2516eae398da989b6b2a368a0b843284':
libexif is now libjhead
2014-03-07 01:04:31 +00:00
Will Haldean Brown
d7b5caabfe
am da9a956b: Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev
...
* commit 'da9a956bd8ea05f7cfffd86a16d395e536960727':
Fix Theme.Micro to not request ActionBar.
2014-03-07 01:03:19 +00:00
Svetoslav
b28f87301f
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.
2014-03-07 00:59:07 +00:00
Marco Nelissen
daefb17c25
am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
...
* commit 'e1af0bd8588ca2de7084853017928729a793b769':
libexif is now libjhead
2014-03-07 00:59:03 +00:00
Will Haldean Brown
da9a956bd8
Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev
2014-03-07 00:56:05 +00:00
Zhijun He
9f97ac433a
ExifInterface: fix class load failure
...
libexif_jni was renamed as libjhead_jni
b/12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
2014-03-06 16:54:05 -08:00
Jay Shrauner
2876797cfb
am 4395a082: am d96e021a: am 1276295b: (-s ours) am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
...
* commit '4395a082d21ac5b05b89100dac9eef40fc244df5':
Prevent SpellChecker from setting invalid range - DO NOT MERGE
2014-03-07 00:50:27 +00:00
Svetoslav
3cd04c99ac
am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
...
* commit 'd2a244f9767ee678d3971c9ad43a07100db4e8c9':
ProgressBar is important for accessibility by default.
2014-03-07 00:47:17 +00:00
Marco Nelissen
e1af0bd858
am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
...
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
libexif is now libjhead
2014-03-07 00:47:02 +00:00
Jay Shrauner
4395a082d2
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
2014-03-07 00:45:06 +00:00
Jay Shrauner
d96e021a9e
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
2014-03-07 00:39:49 +00:00
Svetoslav
d2a244f976
am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
...
* commit '8cb232cb796718ad91e56672a2c8fdbf88633001':
ProgressBar is important for accessibility by default.
2014-03-07 00:39:05 +00:00
Marco Nelissen
4f36104f06
am e29c96e7: Merge "libexif is now libjhead" into klp-dev
...
* commit 'e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
libexif is now libjhead
2014-03-07 00:38:48 +00:00
Svetoslav
8cb232cb79
Merge "ProgressBar is important for accessibility by default." into klp-dev
2014-03-07 00:37:14 +00:00
Marco Nelissen
e29c96e7ae
Merge "libexif is now libjhead" into klp-dev
2014-03-07 00:34:36 +00:00
John Reck
2228195452
Merge "Switch WebView to onDetachedFromWindowInternal"
2014-03-07 00:28:47 +00:00
John Reck
a88bdf8d46
Make sure we register functor count
...
Bug: 13339664
Change-Id: Iafb8ba77bdf1d971c1d0a345ff525e7f7fa80352
2014-03-06 16:22:47 -08:00
Will Haldean Brown
434901078f
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
2014-03-06 16:17:38 -08:00
Marco Nelissen
c0786cc258
libexif is now libjhead
...
b/12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
2014-03-06 16:00:35 -08:00
Jay Shrauner
1276295b6b
am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
...
* commit 'a3ea4be5425fc2a561290c08a9f5f31f374afc31':
Prevent SpellChecker from setting invalid range - DO NOT MERGE
2014-03-07 00:00:14 +00:00
John Reck
34dbce14e8
Switch WebView to onDetachedFromWindowInternal
...
Change-Id: I1036f48f3c98492421430c3894f937884fb4c63e
2014-03-06 15:54:54 -08:00
Leon Scroggins III
5a2c6a2110
am 6f71894b: am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break.
...
* commit '6f71894b8c7f24c00f8963d3508afbd18f3f0910':
DO NOT MERGE - Fix Javadoc build break.
2014-03-06 22:56:33 +00:00
Leon Scroggins III
6f71894b8c
am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break.
...
* commit 'a4d7259c8246a07666f732b5e9fd12280b611d2e':
DO NOT MERGE - Fix Javadoc build break.
2014-03-06 22:45:26 +00:00
George Mount
cf68aad316
Fix problem with Animators pausing the wrong Window.
...
Bug 13347005
Because Windows can share a UI thread, pausing/resuming
Animators in transitions can affect other Windows. This
isolates the pause/resume to the Window being operated
on.
Change-Id: Iac84a0a2c838f30c309eea4931467ba758c6ba78
2014-03-06 14:36:28 -08:00
Jay Shrauner
a3ea4be542
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)
2014-03-06 22:29:12 +00:00
Takahiro Aizawa
092759f6b4
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
2014-03-06 14:18:44 -08:00
John Spurlock
ed452c5f84
Separate power warnings UI from state calculation.
...
Move the existing dialog-based implementation into another class.
Bug:13329308
Change-Id: I87beac1593fd4eea2ea8a498381f7fcc289e0bc0
2014-03-06 17:18:30 -05:00
John Reck
b14dfe20ef
Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""
...
This reverts commit bac16fae7e6fceb1e516252ede673844b772e7c3.
Change-Id: I61e997b23fac1aa984129fdc0328426ff8891bdd
2014-03-06 14:12:35 -08:00
Leon Scroggins III
a4d7259c82
am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break.
...
* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
DO NOT MERGE - Fix Javadoc build break.
2014-03-06 22:09:41 +00:00
Leon Scroggins III
9d3f94b99b
am 86176afd: am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
...
* commit '86176afdeac9133b3b0caf2753a252167d1dad76':
Update framework to use M33 Skia. DO NOT MERGE
2014-03-06 22:09:33 +00:00
Eric Laurent
33ac1218b9
am 6c506aac: am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
...
* commit '6c506aacb2015fd23487a4aa48cbb276ad40cc3a':
Fix RemoteController synchronization mode
2014-03-06 22:09:27 +00:00
Dianne Hackborn
ece7042d7d
am 01579953: am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev
...
* commit '01579953331b415c2ad1f04f91815d1f6eabe1e2':
Fix issue #11536426 DO NOT MERGE
2014-03-06 22:09:23 +00:00
Santos Cordon
056d9ee45a
am 61e385ac: am 59999040: am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
...
* commit '61e385acf0e2c2296baf593b56ca3d4830bfaa02':
Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
2014-03-06 22:09:20 +00:00
Leon Scroggins III
87e9e744ed
am 92a32832: DO NOT MERGE - Fix Javadoc build break.
...
* commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9':
DO NOT MERGE - Fix Javadoc build break.
2014-03-06 21:31:31 +00:00
Leon Scroggins III
86176afdea
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
2014-03-06 21:30:53 +00:00
Eric Laurent
6c506aacb2
am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev
...
* commit '3260f254459fab42fb23389088da0eb73e0e0969':
Fix RemoteController synchronization mode
2014-03-06 21:30:49 +00:00
Dianne Hackborn
0157995333
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
2014-03-06 21:30:47 +00:00
Santos Cordon
61e385acf0
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.
2014-03-06 21:30:45 +00:00
Bart Sears
acbc41d656
Merge "Revert "Workaround apps not calling super.onDetachedFromWindow()""
2014-03-06 21:10:06 +00:00
Bart Sears
bac16fae7e
Revert "Workaround apps not calling super.onDetachedFromWindow()"
...
Requested by jreck to fix the build.
This reverts commit 198d20842a537f3df3584ea084e74220e172b086.
Change-Id: I733065cc124b59bf914034f5bac5e2e951a5b604
2014-03-06 21:09:51 +00:00
Filip Gruszczyński
311bc98362
am 2f1b6851: am fb71862d: Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev
...
* commit '2f1b685154ef178a1e5932f252025a67aec9c1f1':
Setting pretty large divider distance for NumberPicker in clockwork.
2014-03-06 21:02:40 +00:00
Leon Scroggins III
92a3283286
DO NOT MERGE - Fix Javadoc build break.
...
Remove links to non-specific function name.
Bug: 13246311
Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
2014-03-06 20:44:16 +00:00
John Reck
d621e77c8d
Merge "Workaround apps not calling super.onDetachedFromWindow()"
2014-03-06 20:42:52 +00:00
John Reck
198d20842a
Workaround apps not calling super.onDetachedFromWindow()
...
Bug: 13338698
Move the releasing of hardware resources to a new
@hide onDetachedFromWindowInternal
Change-Id: I52b4e6ba4d5b3ce20b89cabffa248d1d780e3e81
2014-03-06 12:40:49 -08:00
Leon Scroggins III
337a200361
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
2014-03-06 20:06:14 +00:00