Narayan Kamath
d556b42909
am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
...
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
AArch64: Use long for pointers in SurfaceSession class
2014-03-07 19:34:28 +00:00
Dianne Hackborn
731ef29831
am 8e904d56: am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
...
* commit '8e904d565e8a54f755814e9ae062743b8b012731':
More on issue #12031685 (DO NOT MERGE)
2014-03-07 18:31:36 +00:00
Chris Wren
48ef4b2dc3
am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
...
* commit '111e981dc7f7d62647d6aa5e6c44cfd13af53608':
use relative positioning for notification actions
2014-03-07 18:31:29 +00:00
Svetoslav
09279ece2f
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 18:31:04 +00:00
Jay Shrauner
94c349d816
am 1276295b: 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 18:30:52 +00:00
Dianne Hackborn
8e904d565e
am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
...
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
More on issue #12031685 (DO NOT MERGE)
2014-03-07 18:15:19 +00:00
Dianne Hackborn
785d764bd5
Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
2014-03-07 18:12:30 +00:00
Chris Wren
111e981dc7
am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev
...
* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
use relative positioning for notification actions
2014-03-07 15:10:47 +00:00
Chris Wren
70d5ed2692
Merge "use relative positioning for notification actions" into klp-dev
2014-03-07 15:08:29 +00:00
Dave Platt
9eca7f8fbc
am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
...
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
Finish fixing Zygote descriptor leakage problem
2014-03-07 02:29:30 +00:00
Paul Duffin
6b786e0012
am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
...
* commit '75d67c6aa051392e711fde3b901a4f2c62f983db':
Improve Parcel's handling of non-primitive arrays
2014-03-07 02:27:47 +00:00
Dianne Hackborn
c1349a9601
am 4ad93639: am 67754d93: Merge "Runtime resource overlay, iteration 2"
...
* commit '4ad93639d210297764db3ffcd870ff38464943de':
Runtime resource overlay, iteration 2
2014-03-07 02:27:10 +00:00
Narayan Kamath
e898f14cd5
am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
...
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
Use long for pointers in EmojiFactory and PdfDocument
2014-03-07 02:26:46 +00:00
Dianne Hackborn
cb15c7a83b
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
2014-03-06 17:39:11 -08: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
Narayan Kamath
ad7c2c2d8d
am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
...
* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
AArch64: Make AssetManager and related classes 64-bit compatible
2014-03-07 00:38:00 +00:00
Narayan Kamath
364d8180d5
am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"
...
* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
Fixed cancel() not working correctly
2014-03-07 00:37:53 +00:00
Brian Carlstrom
ac3b177cc1
am 2cd0563c: am 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit '2cd0563cb8345747d3705d4f339a0800998767fe':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:27 +00:00
Svetoslav
8cb232cb79
Merge "ProgressBar is important for accessibility by default." into klp-dev
2014-03-07 00:37:14 +00: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
Narayan Kamath
5860f4f5f0
am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
...
* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
2014-03-06 22:58:13 +00: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 ea4adf2847 )
2014-03-06 22:29:12 +00:00
Chris Wren
be63a95d2b
use relative positioning for notification actions
...
Bug: 10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d
2014-03-06 14:55:23 -05:00
Svetoslav
6a1846a084
ProgressBar is important for accessibility by default.
...
If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.
Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
(cherry picked from commit 7face75f2c )
2014-03-06 19:31:19 +00:00
Michael Wright
e4a7179278
am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
...
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
Revert Japanese special case fallback keys.
2014-03-06 00:56:59 +00:00
Michael Wright
4448f9d7ad
am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev
...
* commit 'c5dea68e9856698953dafca868eaee7207614641':
Revert Japanese special case fallback keys.
2014-03-06 00:53:22 +00:00
Michael Wright
c5dea68e98
Merge "Revert Japanese special case fallback keys." into klp-dev
2014-03-06 00:50:15 +00:00
Fabrice Di Meglio
6c3a45d7df
am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
...
* commit '57f8a4b4ed48ae3e2488bb3bafcd40137c71ec18':
Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:35:40 +00:00
Fabrice Di Meglio
e1190a994e
am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
...
* commit 'cb6dcd7af2d015b7a3d49f1224936241747bcb43':
Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:35:36 +00:00
Fabrice Di Meglio
57f8a4b4ed
am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
...
* commit '1ff2df6194148f487ccb014a7c5302fa8ffe2571':
Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:32:30 +00:00
Fabrice Di Meglio
cb6dcd7af2
am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
...
* commit '2b58a29f825e6442d8767a36adaf1770b86d5725':
Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:32:27 +00:00
Fabrice Di Meglio
1ff2df6194
Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
2014-03-06 00:29:35 +00:00
Fabrice Di Meglio
2b58a29f82
Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
2014-03-06 00:29:20 +00:00
Fabrice Di Meglio
25d9ce4058
Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
...
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)
Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783
2014-03-05 18:42:56 +00:00
Fabrice Di Meglio
b3670c54e6
Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
...
- force TextView internal layout recreation when its TextDirection is changed
Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit 22228fec05 )
2014-03-05 18:41:36 +00:00
Christopher Tate
a6c5915876
am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
...
* commit 'f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
Update PackageMonitor to recognize new 'replacing' semantics
2014-03-05 00:57:18 +00:00
Christopher Tate
f63ae644a8
am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev
...
* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
Update PackageMonitor to recognize new 'replacing' semantics
2014-03-05 00:54:14 +00:00
Christopher Tate
1e995c7648
Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev
2014-03-05 00:51:04 +00:00
John Spurlock
c6ecac77cf
am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
...
* commit '38f81ccc768958b1a9100cb2caa93ec3aedd9b5e':
Volume panel should not clear system ui flags.
2014-03-04 19:15:56 +00:00
John Spurlock
38f81ccc76
am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
...
* commit 'fee6f69e8321c3f94c2b341fe483f7b1f6534169':
Volume panel should not clear system ui flags.
2014-03-04 19:12:40 +00:00
John Spurlock
ca4d040342
Volume panel should not clear system ui flags.
...
Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.
Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.
Reverts part of I25f29af5b6518aba695b64a75977ae240b742118
Bug:11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
2014-03-04 10:12:01 -05:00
Christopher Tate
88c908323a
Update PackageMonitor to recognize new 'replacing' semantics
...
The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
on a forward-locked application. Update PackageMonitor to recognize this
new information and express it appropriately to the observer.
Bug 11988313
Cherry-pick from master.
Change-Id: Iecea1876ffc918f23f9fa5845f1f89ed8d740dd5
2014-03-03 17:40:41 -08:00
Jay Shrauner
7e3efa82ec
am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
...
* commit '1f168fd43895e2a84c037df9f3ea54e36f5d0d16':
Catch ActivityNotFoundException in quick contacts badge
2014-03-03 22:02:14 +00:00
Jay Shrauner
1f168fd438
am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
...
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
Catch ActivityNotFoundException in quick contacts badge
2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93
Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
2014-03-03 21:56:18 +00:00
Jonathan Dixon
3c88a68502
am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
...
* commit '7c01f9f7abd9eb1aefdf712be98d57e4075422bb':
DO NOT MERGE: Fix build after checkThread fix merge to master
2014-03-03 20:29:46 +00:00
Bart Sears
7f9503267c
am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
...
* commit 'e31c05296d8cde8f6d99f18ef039fd6823ec54a9':
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
2014-03-03 20:29:43 +00:00
Jonathan Dixon
7c01f9f7ab
am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
...
* commit 'efe1b2402abd6f26f6483533b68983475f6e6144':
DO NOT MERGE: Fix build after checkThread fix merge to master
2014-03-03 18:54:35 +00:00
Bart Sears
e31c05296d
am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
...
* commit '4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
2014-03-03 18:50:25 +00:00
Jonathan Dixon
efe1b2402a
DO NOT MERGE: Fix build after checkThread fix merge to master
...
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.
Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba )
Cherry pick to klp-dev as part of Bug: 13246014
2014-03-03 18:48:00 +00:00