Yuhao Zheng
b1bf5f6132
am 41c55361: am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
...
* commit '41c55361d1a68d5d41cc2ff5b1b486b0ed0109fc':
Add a hidden API to toggle airplane mode.
2013-09-10 10:16:50 -07:00
Yuhao Zheng
41c55361d1
am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
...
* commit 'e91a3f5229405b39a3ba59aa0a3e44527eef063e':
Add a hidden API to toggle airplane mode.
2013-09-10 10:13:22 -07:00
Martijn Coenen
468b6e753f
am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev
...
* commit '6343075fbf1fef40d421d060b807e8cbc08849cf':
Remove legacy HCE APIs.
2013-09-10 10:13:14 -07:00
Yuhao Zheng
e91a3f5229
Merge "Add a hidden API to toggle airplane mode." into klp-dev
2013-09-10 17:12:00 +00:00
Martijn Coenen
6343075fbf
am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev
...
* commit '9720d5e11c5175503b383bd903c68d2408d2bb80':
Remove legacy HCE APIs.
2013-09-10 10:07:38 -07:00
Martijn Coenen
9720d5e11c
Merge "Remove legacy HCE APIs." into klp-dev
2013-09-10 17:04:32 +00:00
Yuhao Zheng
5cd1a0e8d7
Add a hidden API to toggle airplane mode.
...
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570
Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
2013-09-10 09:57:12 -07:00
Amith Yamasani
a927fb6169
am 23d6b7b3: am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev
...
* commit '23d6b7b36096eef53f819ee5eee0aba3beecde67':
Don't leave space for summary text if it's an empty string
2013-09-10 09:02:43 -07:00
Amith Yamasani
23d6b7b360
am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev
...
* commit '618f8cc5dbb6dff03ad3270d6b948b1ef90c5dd6':
Don't leave space for summary text if it's an empty string
2013-09-10 09:01:09 -07:00
Amith Yamasani
618f8cc5db
Merge "Don't leave space for summary text if it's an empty string" into klp-dev
2013-09-10 15:59:37 +00:00
Jeff Sharkey
9a60acd77c
am 7b69c566: am 9e2c661b: Merge "Fix getCallingPackage() to handle reentrance." into klp-dev
...
* commit '7b69c566fd1cb1242e805462fdb6ceb6d9bef0a7':
Fix getCallingPackage() to handle reentrance.
2013-09-09 21:48:46 -07: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
d04e0c0adb
am 78bb372f: am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev
...
* commit '78bb372fb70b7c383ae4ab158734666de9ce8e95':
Rename offer() to add(), remove/hide some APIs.
Sort order is sticky for session, back leaves.
2013-09-09 21:45:11 -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
e995af44a7
am 404c4855: am 392c76b1: Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev
...
* commit '404c4855ab0f85bd5ccccf0d3e443819bad6762a':
Clarify InputDevice#getControllerNumber documentation
2013-09-09 20:40:09 -07: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
b53786d913
am 37b7632a: am bc916b22: Fix checkbuild error due to javadoc reference to hidden class
...
* commit '37b7632add23aedd489b1468d39973821609303c':
Fix checkbuild error due to javadoc reference to hidden class
2013-09-09 19:31:25 -07: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
Alan Viverette
5b73e36507
Merge "Add View constructor that supplies a default style resource"
2013-09-10 02:04:22 +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
Alan Viverette
617feb99a0
Add View constructor that supplies a default style resource
...
Also updates the constructor of every class that extends View.
BUG: 10676369
Change-Id: Ifaf27bf82028d180afa4931c0e906df88d858ac3
2013-09-09 18:09:13 -07: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
0b4c23efd9
am 6874b17d: am ff44ed58: Merge "Disabled states, more UX work, bug fixes." into klp-dev
...
* commit '6874b17d7937a4616a119aea58c8a9c8acef4e7f':
Disabled states, more UX work, bug fixes.
2013-09-09 17:15:23 -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
Sandeep Siddhartha
8f86b844d2
am e6139bf0: am 85e7177a: Merge "Move public consts to HotwordRecognitionService" into klp-dev
...
* commit 'e6139bf08680120cf1437621f2aadabd82a50197':
Move public consts to HotwordRecognitionService
2013-09-09 16:32:43 -07: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
Chet Haase
01ed358ce0
am be4b4824: am bce89a42: Merge "Add updateListener to ViewPropertyAnimator" into klp-dev
...
* commit 'be4b48240e2e498ad32894ae9ab9716ecfedcf45':
Add updateListener to ViewPropertyAnimator
2013-09-09 16:09:55 -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
Matthew Williams
43afbe5842
am 22902f54: am bec23ea9: Merge "Preserve CTS fail behaviour on null bundle for old API" into klp-dev
...
* commit '22902f541e61bf9a1030fd87683102fe125ec135':
Preserve CTS fail behaviour on null bundle for old API
2013-09-09 15:12:57 -07: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
Amith Yamasani
b25158886b
Don't leave space for summary text if it's an empty string
...
Bug: 10639567
Change-Id: Ifeb71ea0779a86e39fe55fb0bc6cd267dba4a92e
2013-09-09 14:50:21 -07: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
b7b64ffca7
am 5afe5288: am 4d0b9aba: Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev
...
* commit '5afe5288a60a5264efb1e6979a065351482b1a18':
Fix clearApplicationUserData() to allow a null observer
2013-09-09 14:33:43 -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
Chet Haase
208ebece29
am 3327dfd4: am d94b1e11: Merge "Show view overlays in hierarchyviewer" into klp-dev
...
* commit '3327dfd43ca82f28a2517de8f275cd64ca335d0b':
Show view overlays in hierarchyviewer
2013-09-09 14:29:14 -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
Svetoslav Ganov
e668c0a175
am 994e5a5a: am 3bbd3aea: Merge "AccessibilityNodeInfo incorrectly cloned." into klp-dev
...
* commit '994e5a5afcf88923815e2b241dc8f15fe82823c8':
AccessibilityNodeInfo incorrectly cloned.
2013-09-09 14:14:57 -07:00
Mindy Pereira
140fd18968
am 3412c80e: am 99cea983: Merge "Update default ramp up time for autoscroller." into klp-dev
...
* commit '3412c80e76ce4a5a5d5615bb66d6b871854400c0':
Update default ramp up time for autoscroller.
2013-09-09 14:14:43 -07:00
Svetoslav Ganov
b47a65eeec
am 5e811115: am cf305e18: Merge "Add dumping the state of the print sub-system." into klp-dev
...
* commit '5e811115a9e106a9a167354ba6700146015ecb97':
Add dumping the state of the print sub-system.
2013-09-09 14:14:39 -07:00