Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,870 Commits 3 Branches 0 Tags
ef97ba19581f787546ba3aa3e433af6a92cf3ebd
Commit Graph

33689 Commits

Author SHA1 Message Date
Martijn Coenen
ef97ba1958 am 61fdf6d1: am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev 
* commit '61fdf6d155a4fad1d27a7593618d29f638ea9f6a':
  Add NFC reader-mode API.
 2013-08-27 16:14:59 -07:00
Martijn Coenen
bbbc8660cd Merge "Add NFC reader-mode API." into klp-dev 2013-08-27 23:08:56 +00:00
Alan Viverette
9d345ff4cb am 5c5fbb39: am 3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 
* commit '5c5fbb39ec7c2ee51ad2b74c9c4604bb575bb6f7':
  Add documentation to onTouchEvent for accessibility
 2013-08-27 15:55:58 -07:00
Alan Viverette
3d1b3cb9d9 Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 2013-08-27 22:48:03 +00:00
Jeff Hao
78da49f4bc Merge MPSE and SPSE Chunk handlers for ddms. 
Change-Id: Ic25d31ee16f65a638ecb8957636ebfdb9beb4eb7
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)
 2013-08-27 22:37:58 +00:00
Jeff Hao
55de3f5442 Merge "Add frameworks support for sample profiling from traceview gui." 2013-08-27 22:17:40 +00:00
Martijn Coenen
c20ed2ff12 Add NFC reader-mode API. 
Allows applications to temporarily force the NFC controller
to only do tag discovery. This will allow Android applications
to read and interact with devices that employ HCE.

Bug: 10360259
Change-Id: I709ead9a26f8e6ae8582cc295d82bd896e7c5bba
 2013-08-27 14:32:53 -07:00
Craig Mautner
c5dd502056 am 8fce994c: am ac738a25: Merge "Hide stackId from prying eyes." into klp-dev 
* commit '8fce994c8472a29197aa4c5dae070c7be518ad3f':
  Hide stackId from prying eyes.
 2013-08-27 14:27:29 -07:00
Christopher Tate
eb2177b2ba am 4b739259: am d381680b: Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev 
* commit '4b739259d2a451df9bd317b1ce2d1c0169ab9e6e':
  Make sure to actually log when Log.wtf() hiccups
 2013-08-27 14:24:00 -07:00
Craig Mautner
ac738a25f8 Merge "Hide stackId from prying eyes." into klp-dev 2013-08-27 21:20:30 +00:00
Christopher Tate
d381680b63 Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev 2013-08-27 21:15:03 +00:00
Christopher Tate
941adc95e1 Make sure to actually log when Log.wtf() hiccups 
Bug 10494724

Change-Id: I687d7df73a8f4594d42955f100d928e98bbd9b30
 2013-08-27 14:10:44 -07:00
Jeff Hao
e3d54fe23a Add frameworks support for sample profiling from traceview gui. 
Change-Id: I702f12cdd8bd27b762f30e158fbe824909421dee
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
 2013-08-27 20:53:09 +00:00
Chet Haase
f87fa1b5a8 am b9a474c2: am f1c3f28e: Merge "Fix NPE when setting new LayoutTransition" into klp-dev 
* commit 'b9a474c29bfb2cc69710b0716f756cfea9e64c00':
  Fix NPE when setting new LayoutTransition
 2013-08-27 13:28:02 -07:00
Fabrice Di Meglio
e94aceabdb resolved conflicts for merge of 71de1312 to master 
Change-Id: Ib2065147a3160b5176fd44a4d14bec06c7c973e1
 2013-08-27 12:56:20 -07:00
Chet Haase
f1c3f28eb9 Merge "Fix NPE when setting new LayoutTransition" into klp-dev 2013-08-27 19:50:43 +00:00
Chet Haase
fee6f2b3d3 Fix NPE when setting new LayoutTransition 
ViewGroup.setLayoutTransition() has logic to cancel a previously-running
transition and remove the ViewGroup's listener from that transition. However,
it is possible for the transition to be set to null on the ViewGroup on the
cancel() call, making the next call to remove the listener crash with an NPE.

The fix is to use a temporary variable to hold the old reference and
not depend on the class instance variable remaining valid/non-null across
the call to cancel().

Issue #10488932 Hangout NPE in ViewGroup.setLayoutTransition on initiating a new conversation
Issue #10509201 ViewGroup.setLayoutTransition(null) causes crash when being called in LayoutTransition.TransitionListener.endTransition()

Change-Id: I7c181b79e6601024c93a8dc246d32b751f78b216
 2013-08-27 12:22:29 -07:00
Fabrice Di Meglio
6d7771b575 Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev 2013-08-27 19:04:13 +00:00
Tom O'Neill
a6fd96c420 am 3bc13da4: am aeda265c: Merge "Remove or reduce visibility of deprecated methods" into klp-dev 
* commit '3bc13da4814fa3020ada4707aee94156af0410fc':
  Remove or reduce visibility of deprecated methods
 2013-08-27 11:31:16 -07:00
Chris Wren
b07d769524 am ee4a2728: am d220a830: Merge "Change DBG to false to eliminate logcat messages." into klp-dev 
* commit 'ee4a272876619da6518a39dc41ed8505a6265110':
  Change DBG to false to eliminate logcat messages.
 2013-08-27 11:27:49 -07:00
Tom O'Neill
aeda265c4d Merge "Remove or reduce visibility of deprecated methods" into klp-dev 2013-08-27 18:23:18 +00:00
Chris Wren
d220a830f4 Merge "Change DBG to false to eliminate logcat messages." into klp-dev 2013-08-27 18:20:44 +00:00
Svetoslav Ganov
a07935f4a5 am c97ab7ea: am 6b8c69ed: Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev 
* commit 'c97ab7ea992ff57835cf3be2805c71bcb7ac4658':
  Update AccessibilityNodeInfo API as per API council request
 2013-08-27 11:18:49 -07:00
Svetoslav Ganov
6b8c69edd2 Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev 2013-08-27 18:14:01 +00:00
Tom O'Neill
7f6f45723a Remove or reduce visibility of deprecated methods 
- Fix additional getInt() path, restores the location settings screen
functionality.

- Should fix "unresolved link" build breakages in
git_klp-dev-plus-aosp-without-vendor, which is much more persnickety than
klp-dev for some reason.

- Add warning that we may add additional location modes in the future.

- Finish fix for b/10461763 and b/10461474

Change-Id: Id7155e3a0d7526a377d446018ef3bdb057bad3a6
 2013-08-27 10:53:15 -07:00
Eino-Ville Talvala
8997431aec am 713f4914: am fb3d7811: Merge "Camera2: Add CameraDevice#flush()" into klp-dev 
* commit '713f4914bc5bd1e822192ba4fcf78909c943c95d':
  Camera2: Add CameraDevice#flush()
 2013-08-27 10:30:46 -07:00
Tom O'Neill
8b38815108 am a413551c: am 4a9c7fec: Merge "Address API council comments on location mode API council" into klp-dev 
* commit 'a413551cf92254106a61aa024509dc9e5b72fdfe':
  Address API council comments on location mode API council
 2013-08-27 10:30:35 -07:00
Sandeep Siddhartha
fe7b9ff5ce am a9e0d7b9: am 4e22b851: Merge "Touch up the Hotword API" into klp-dev 
* commit 'a9e0d7b952e7a9f49f8b3bceabbc75e93a67167b':
  Touch up the Hotword API
 2013-08-27 10:30:05 -07:00
Sandeep Siddhartha
b1401f99a1 am f7a7a636: am b0a17400: Merge "Add Service API to perform Hotword recognition" into klp-dev 
* commit 'f7a7a636f6a38b8de9a54911152ec5858e344db6':
  Add Service API to perform Hotword recognition
 2013-08-27 10:29:52 -07:00
Vinit Deshapnde
be8df3d1eb am 4bdda528: am ca915793: Merge "Increase sampling data size limits" into klp-dev 
* commit '4bdda528182b5cb6e3f9c0a1c64d714d0d1d74d0':
  Increase sampling data size limits
 2013-08-27 10:29:41 -07:00
Eino-Ville Talvala
fb3d78118b Merge "Camera2: Add CameraDevice#flush()" into klp-dev 2013-08-27 16:49:04 +00:00
Tom O'Neill
4a9c7fec66 Merge "Address API council comments on location mode API council" into klp-dev 2013-08-27 15:44:16 +00:00
Svetoslav Ganov
cb8ed39b3f Update AccessibilityNodeInfo API as per API council request 
bug:10461302

Change-Id: I9709a271ab3720e064b98c79c0950d811fe37b73
 2013-08-27 08:26:13 -07:00
Ben Murdoch
74a6e28007 Fix the build. 
Use correct javadoc in BluetoothHeadset.java.

Change-Id: I17b4cf570036ebf426252229fe9ef377ced9b67b
 2013-08-27 12:39:40 +01:00
Sandeep Siddhartha
4e22b851be Merge "Touch up the Hotword API" into klp-dev 2013-08-27 02:24:25 +00:00
Sandeep Siddhartha
407d794a9d Touch up the Hotword API 
- Few comments got missed from the last review

Change-Id: I933912c51794875be5d129351d4f06bc040537a6
 2013-08-26 18:01:34 -07:00
Ying Wang
b240578f03 Fix docs build. 
Change-Id: I7bfcfea052de6959230bb361400e760eab35b78c
 2013-08-26 17:48:22 -07:00
Sandeep Siddhartha
b0a17400cb Merge "Add Service API to perform Hotword recognition" into klp-dev 2013-08-27 00:38:40 +00:00
Sandeep Siddhartha
637cc45809 Add Service API to perform Hotword recognition 
Change-Id: I855330b255a12cce309aa11e0b7cde5b8e061043
 2013-08-26 17:32:16 -07:00
Vinit Deshapnde
ca91579350 Merge "Increase sampling data size limits" into klp-dev 2013-08-27 00:23:10 +00:00
Chet Haase
73fd8983ba am 81d9379b: am be6cf71d: Merge "Tweak visibility logic for inflated view scenarios" into klp-dev 
* commit '81d9379b433741babaf3a755c5a90bc1232a6278':
  Tweak visibility logic for inflated view scenarios
 2013-08-26 16:35:06 -07:00
Chet Haase
be6cf71dc5 Merge "Tweak visibility logic for inflated view scenarios" into klp-dev 2013-08-26 23:29:35 +00:00
Chet Haase
35a457a3ba Tweak visibility logic for inflated view scenarios 
Previously, Visibility would determine whether a given view was
worthy of a transition by checking the visibility of that view's
parent hierarchy. This is done to avoid fading every view in
a hierarchy when only the top-most node should be faded.

However, the logic was flawed because it assumed the end scene
parent was stable between scenes, which is not the case with inflated
layout scenes, in which the parent views are not the same, even though they
may represent the same parents (via ids).

The new approach is to check information on both the start and end scene
parents, and to take ids into account when checking the state of these
parents in the start/end scenes. Also, avoid this logic altogether if the
transition is targeted at specific views (don't bother checking the
parents if the transition was told to fade specific views).

Issue #10442447 Transitions: Fades don't happen correctly in some situations

Change-Id: Icea24b892f2eff2d37c6436ccfe4e288aac84178
 2013-08-26 16:04:11 -07:00
Adam Powell
13bd30efd2 am 4373cc90: am 04e3a14c: Merge "Expand documentation around ViewParent#childHasTransientStateChanged" into klp-dev 
* commit '4373cc90d3d04f4f93e2ded45664c7fc58a19571':
  Expand documentation around ViewParent#childHasTransientStateChanged
 2013-08-26 15:37:58 -07:00
Alan Viverette
3c6e8f43b4 Add documentation to onTouchEvent for accessibility 
BUG: 10429918
Change-Id: I2e2826601ba1560186e19f15928de41674a72505
 2013-08-26 15:29:03 -07:00
Alan Viverette
84ba33acf9 am b1986354: am aad44178: Merge "Use transient state to preserve accessibility focus in ListView" into klp-dev 
* commit 'b19863545ddf5f071926869d92aeb9aa38f2f857':
  Use transient state to preserve accessibility focus in ListView
 2013-08-26 15:12:03 -07:00
Alan Viverette
4425a3d250 am 37eb3034: am faf7a208: Merge "Add auto-scrolling in ListPopupWindow drag-to-open mode" into klp-dev 
* commit '37eb3034a3a090587d6a0fba61c7ec703f901da5':
  Add auto-scrolling in ListPopupWindow drag-to-open mode
 2013-08-26 15:12:00 -07:00
Alan Viverette
06804da177 am 46502580: am 9212e350: Merge "Reconcile drag-to-open and touch event interception" into klp-dev 
* commit '465025803983e1f8ff4d9468fcc86ee4467139c9':
  Reconcile drag-to-open and touch event interception
 2013-08-26 15:11:56 -07:00
Edward Jee
dc92854513 am 0b3adcdf: am b2cc1d54: Merge "Enables AT+ANDROID command in Bluetooth HFP." into klp-dev 
* commit '0b3adcdfd30cd3b0eb25a3d7929ae0cecd608d74':
  Enables AT+ANDROID command in Bluetooth HFP.
 2013-08-26 15:11:49 -07:00
Igor Murashkin
3b954819ca am 395375e1: am 9e680685: Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev 
* commit '395375e1b0b2ae2250cbd850bda0cbfe94fe8073':
  camera2: CameraDevice#configureOutputs now deletes unused streams
 2013-08-26 15:11:46 -07:00