Baligh Uddin
ad53a540ed
am a244732d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit 'a244732d93c09da1db9fd79b6e7275649a18c60b':
Import translations. DO NOT MERGE
2013-09-09 22:02:58 -07:00
Baligh Uddin
a244732d93
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-10 04:58:04 +00:00
Jeff Sharkey
7b69c566fd
am 9e2c661b: Merge "Fix getCallingPackage() to handle reentrance." into klp-dev
...
* commit '9e2c661b3ba26fa8de1299608e27aa95e124a413':
Fix getCallingPackage() to handle reentrance.
2013-09-09 21:46:18 -07:00
Jeff Sharkey
78bb372fb7
am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev
...
* commit 'af9272349fb9eed1653d5af0768c9517e36070a6':
Rename offer() to add(), remove/hide some APIs.
Sort order is sticky for session, back leaves.
2013-09-09 21:42:50 -07:00
Jeff Sharkey
9e2c661b3b
Merge "Fix getCallingPackage() to handle reentrance." into klp-dev
2013-09-10 04:41:53 +00:00
Jeff Sharkey
af9272349f
Merge changes I7b3f4c68,I9f022a08 into klp-dev
...
* changes:
Rename offer() to add(), remove/hide some APIs.
Sort order is sticky for session, back leaves.
2013-09-10 04:40:41 +00:00
Jeff Brown
404c4855ab
am 392c76b1: Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev
...
* commit '392c76b1f6bc756359a70263c1708682f884027a':
Clarify InputDevice#getControllerNumber documentation
2013-09-09 20:37:52 -07:00
Jeff Brown
392c76b1f6
Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev
2013-09-10 03:35:55 +00:00
Sandeep Siddhartha
37b7632add
am bc916b22: Fix checkbuild error due to javadoc reference to hidden class
...
* commit 'bc916b221a344d0d2f8f6353c5162f9a6d61eb8b':
Fix checkbuild error due to javadoc reference to hidden class
2013-09-09 19:30:09 -07:00
Sandeep Siddhartha
bc916b221a
Fix checkbuild error due to javadoc reference to hidden class
...
Change-Id: I128b8a6dd725468d0c9503b8229f8939fddb51bc
2013-09-10 02:17:20 +00:00
Jeff Sharkey
72e2e3577b
Fix getCallingPackage() to handle reentrance.
...
Keep any previous value in the stack frame and restore when the
current call is finished.
Bug: 10659409
Change-Id: I02b760ae9ca06a4b3602725e02f649f1ada460a0
2013-09-09 18:52:48 -07:00
Xia Wang
9d5182f9db
am 11f2b42d: Remove system user id for cm tests
...
* commit '11f2b42d8c185ac91db07a539605cba7ecd28e6a':
Remove system user id for cm tests
2013-09-09 18:15:59 -07:00
Xia Wang
11f2b42d8c
Remove system user id for cm tests
...
Change-Id: I51f500c8e7b4e2963093e20c6f20bcfe020995c9
(cherry picked from commit 575495c29007503566e28004bf60018a824b1f1b)
2013-09-10 01:07:33 +00:00
Jeff Sharkey
b7757a6b32
Rename offer() to add(), remove/hide some APIs.
...
Change MatrixCursor offer() to add() based on review feedback. Remove
some now-unused XML metadata. Hide document creation, since it's not
supported in initial version.
Bug: 10577809, 10461706, 10678563
Change-Id: I7b3f4c6899c28f633471ef816bee22bf032aa0d2
2013-09-09 17:55:10 -07:00
Jeff Sharkey
fb3445c9b3
Sort order is sticky for session, back leaves.
...
Instead of persisting sort order per-directory, the order is now
sticky for that session. Any user selected sort order takes
precedence over an ordering hinted by a backend.
When a restored DocumentStack is untouched, the back key now leaves
the dialog, instead of popping from the restored stack.
Persist list/grid mode changes async.
Bug: 10659604, 10672973
Change-Id: I9f022a081c014537447c9c2af10e19d8cd9566aa
2013-09-09 17:35:48 -07:00
Jeff Sharkey
6874b17d79
am ff44ed58: Merge "Disabled states, more UX work, bug fixes." into klp-dev
...
* commit 'ff44ed58a1e38ff830e74b0d73549ff01725852d':
Disabled states, more UX work, bug fixes.
2013-09-09 17:10:24 -07:00
Jeff Sharkey
ff44ed58a1
Merge "Disabled states, more UX work, bug fixes." into klp-dev
2013-09-10 00:08:17 +00:00
Jeff Sharkey
3f4c205fd3
Disabled states, more UX work, bug fixes.
...
Fix drawable state to correctly show dimmed disabled state. Update
disabled state for all children to grey out text.
Block multi-selection of documents not matching MIME filter. Load
thumbnails in parallel. Show thumbnails in list mode based on MIME
type to match spec.
Give each footer a unique view type to avoid recycler crashes.
Show breadcrumb icons in recent create paths. Fix timestamp bug when
querying/updating recent paths.
Make ContentProviderClient.closeQuietly() really be quiet.
Bug: 10668364, 10510022, 10668701, 10534224, 10667726
Change-Id: I3c705412fb211519f15ad41a273a7533b878e9e5
2013-09-09 16:55:35 -07:00
Tim Murray
9163b1d9ce
am 23ae1461: Merge "Add flags word to initialization." into klp-dev
...
* commit '23ae1461d2cf0ac3f1da71200544381a8d8a4957':
Add flags word to initialization.
2013-09-09 16:53:16 -07:00
Tim Murray
23ae1461d2
Merge "Add flags word to initialization." into klp-dev
2013-09-09 23:34:38 +00:00
Sandeep Siddhartha
e6139bf086
am 85e7177a: Merge "Move public consts to HotwordRecognitionService" into klp-dev
...
* commit '85e7177abe3024218de589a94bc0914bcfe51547':
Move public consts to HotwordRecognitionService
2013-09-09 16:30:10 -07:00
Sandeep Siddhartha
85e7177abe
Merge "Move public consts to HotwordRecognitionService" into klp-dev
2013-09-09 23:25:27 +00:00
Tim Murray
9578e64240
Add flags word to initialization.
...
bug 10427951
Change-Id: I1356b9b96315ead44aa3898de5604d75f9bb8be5
2013-09-09 16:23:27 -07:00
Chet Haase
be4b48240e
am bce89a42: Merge "Add updateListener to ViewPropertyAnimator" into klp-dev
...
* commit 'bce89a426978ab7bd40e5fa9eb2d99e569422a2e':
Add updateListener to ViewPropertyAnimator
2013-09-09 16:06:23 -07:00
Chet Haase
bce89a4269
Merge "Add updateListener to ViewPropertyAnimator" into klp-dev
2013-09-09 23:03:28 +00:00
Chris Craik
47e6c4be1e
am 932e59fc: Merge "Create a pixelref wrapper for reused bitmaps" into klp-dev
...
* commit '932e59fc2aae145a8930e4a2da4885f607fd47aa':
Create a pixelref wrapper for reused bitmaps
2013-09-09 16:02:43 -07:00
Chris Craik
932e59fc2a
Merge "Create a pixelref wrapper for reused bitmaps" into klp-dev
2013-09-09 23:00:49 +00:00
Andy McFadden
324738e700
am 440f4dfa: Merge "Fix pixel test" into klp-dev
...
* commit '440f4dfac89c113b41f1a7259306b90b0cde8768':
Fix pixel test
2013-09-09 15:59:06 -07:00
Andy McFadden
440f4dfac8
Merge "Fix pixel test" into klp-dev
2013-09-09 22:55:35 +00:00
Matthew Williams
22902f541e
am bec23ea9: Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev
...
* commit 'bec23ea922566c4b1656deffe1b1951575ae923f':
Preserve CTS fail behaviour on null bundle for old API
2013-09-09 15:10:10 -07:00
Matthew Williams
bec23ea922
Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev
2013-09-09 22:06:05 +00:00
Craig Mautner
e2b8bd72bd
am 16c32207: Merge "Do not enter resumeTopActivity recursively." into klp-dev
...
* commit '16c3220734f3cbf32c0148d82815d93e2f28af65':
Do not enter resumeTopActivity recursively.
2013-09-09 14:57:49 -07:00
Craig Mautner
16c3220734
Merge "Do not enter resumeTopActivity recursively." into klp-dev
2013-09-09 21:55:20 +00:00
Matthew Williams
d8abd6a163
Preserve CTS fail behaviour on null bundle for old API
...
For ContentResolver.requestSync() a null bundle should not be
allowed. However we don't want to enforce this for the new API,
so we remove this check from the SyncRequest.Builder#build()
Change-Id: I69353d24edbd686da6ded2856c0920315cb76e85
2013-09-09 14:35:27 -07:00
Christopher Tate
5afe5288a6
am 4d0b9aba: Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev
...
* commit '4d0b9abae70bdf9a083c3ff7c92088e47637c57a':
Fix clearApplicationUserData() to allow a null observer
2013-09-09 14:29:45 -07:00
Christopher Tate
4d0b9abae7
Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev
2013-09-09 21:26:50 +00:00
Chet Haase
3327dfd43c
am d94b1e11: Merge "Show view overlays in hierarchyviewer" into klp-dev
...
* commit 'd94b1e11b94b599a70e4a8cf738a9f62b7d67e36':
Show view overlays in hierarchyviewer
2013-09-09 14:25:17 -07:00
Christopher Tate
31b65f9aa1
Fix clearApplicationUserData() to allow a null observer
...
The services themselves already handle 'null' to mean "no observer";
it was just the non-AIDL marshalling code that wasn't doing the
right thing.
Bug 9588299
Change-Id: I99e26cd207f91e8060d9fc113aef90a106640b64
2013-09-09 14:17:27 -07:00
Chet Haase
d94b1e11b9
Merge "Show view overlays in hierarchyviewer" into klp-dev
2013-09-09 21:10:56 +00:00
Svetoslav Ganov
994e5a5afc
am 3bbd3aea: Merge "AccessibilityNodeInfo incorrectly cloned." into klp-dev
...
* commit '3bbd3aea604e6132c95a2f1f6e10c993ecc70d8b':
AccessibilityNodeInfo incorrectly cloned.
2013-09-09 14:08:33 -07:00
Leon Scroggins III
a818f0face
am 91c8111d: Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev
...
* commit '91c8111d3ae654e7646e9cbcf486554a8810b47c':
Register jni objs in CreateJavaOutputStreamAdaptor
2013-09-09 14:08:30 -07:00
Chris Craik
177718a7d2
am f25fceef: Merge "Update doc for BitmapFactory.Options to include BitmapRegionDecoder" into klp-dev
...
* commit 'f25fceefdfc35079799c7cb6e01b28dce8a5bfce':
Update doc for BitmapFactory.Options to include BitmapRegionDecoder
2013-09-09 14:08:27 -07:00
Mindy Pereira
3412c80e76
am 99cea983: Merge "Update default ramp up time for autoscroller." into klp-dev
...
* commit '99cea983de196aae34a39cd4eb03ae1f93cc771a':
Update default ramp up time for autoscroller.
2013-09-09 14:08:24 -07:00
Svetoslav Ganov
5e811115a9
am cf305e18: Merge "Add dumping the state of the print sub-system." into klp-dev
...
* commit 'cf305e18c316cc53e4870548df3cc886d4ef5418':
Add dumping the state of the print sub-system.
2013-09-09 14:08:22 -07:00
Dianne Hackborn
d8c06fab80
am 80213add: Merge "Fix issue #10671878 : Proc stats needs to remove old data structures" into klp-dev
...
* commit '80213adddaec79981aff47c81bdaac38725f2644':
Fix issue #10671878 : Proc stats needs to remove old data structures
2013-09-09 14:08:19 -07:00
Alan Viverette
b198dbaf19
am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev
...
* commit '013634cc44d62fe90cd3e80a7530cffdc79f9715':
Add WebVTT caption renderer
2013-09-09 14:08:14 -07:00
Eric Rowe
f2a24a0672
am 93d71945: Merge "Add PID and application to Java crash printout" into klp-dev
...
* commit '93d71945d88f38b784de3c12d7ae781e97735582':
Add PID and application to Java crash printout
2013-09-09 14:08:12 -07:00
Chris Craik
cd0ba71aa9
Create a pixelref wrapper for reused bitmaps
...
Reused bitmaps may gain a color table when reused, so we wrap a new
AndroidPixelRef that holds the color table around the old.
bug:10608305
Change-Id: I35288edf3158cfda21c500360ad1abdf5654af8d
2013-09-09 14:08:11 -07:00
Svetoslav Ganov
3bbd3aea60
Merge "AccessibilityNodeInfo incorrectly cloned." into klp-dev
2013-09-09 21:06:38 +00:00
Leon Scroggins III
91c8111d3a
Merge "Register jni objs in CreateJavaOutputStreamAdaptor" into klp-dev
2013-09-09 20:57:12 +00:00