drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,574 Commits 1 Branch 0 Tags
Commit Graph

121574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
94723401bd am 04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '04acf38ce281f86bd0f28485405c59e489657dfb':
  Import translations. DO NOT MERGE
 2014-04-22 14:49:14 +00:00
Baligh Uddin
04acf38ce2 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-22 14:46:28 +00:00
Andrew Solovay
97b7208fa4 am da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sample. 
* commit 'da1a10f727746f9f85c576adb2c4c91c552255f3':
  Fixed a typo in a code sample.
 2014-04-22 13:36:44 +00:00
Guang Zhu
65bcc3ff92 am 6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev 
* commit '6c0454ecae4fe46b7032299d02fc6da80f171ed2':
  add bt instrumentation to run as a util
 2014-04-22 13:27:56 +00:00
Craig Mautner
43c6a98f0f am 6985badc: Fix black ActivityView 
* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
  Fix black ActivityView
 2014-04-22 13:27:53 +00:00
Craig Mautner
51bd56c953 am 6cdf51f2: Don\'t use finalize on ActivityView to cleanup. 
* commit '6cdf51f21df1ca2397618635767e6e53a65799ad':
  Don't use finalize on ActivityView to cleanup.
 2014-04-22 13:27:49 +00:00
Craig Mautner
c00c89b1ad am f4c909bc: Fix ActivityView lifecycle 
* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle
 2014-04-22 13:27:44 +00:00
Andrew Solovay
da1a10f727 am c68e2089: am 3555e4ae: Fixed a typo in a code sample. 
* commit 'c68e2089755dc35b34d620944bcceb63e1283015':
  Fixed a typo in a code sample.
 2014-04-22 13:27:09 +00:00
Andrew Solovay
c68e208975 am 3555e4ae: Fixed a typo in a code sample. 
* commit '3555e4aef0d5664645e35d33779bf1bd140a7e50':
  Fixed a typo in a code sample.
 2014-04-22 13:20:44 +00:00
Guang Zhu
6c0454ecae Merge "add bt instrumentation to run as a util" into klp-modular-dev 2014-04-22 03:33:47 +00:00
Guang Zhu
03800b8873 add bt instrumentation to run as a util 
some bt test util methods are useful as device setup util, this
change exposes some of them via a BluetoothInstrumentation so
that they can be invoked like commands for setting up or
controlling bt state in test harness

Change-Id: I1d40baf374e145ab550ae4fa5f581e2eaf2e29bb
 2014-04-21 19:06:17 -07:00
Andrew Solovay
3555e4aef0 Fixed a typo in a code sample. 
Fix is staged to: http://asolovay.mtv.corp.google.com:9000/guide/topics/ui/actionbar.html#Dropdown

Bug: 14043905

Change-Id: I8b71d55d51bf88ab9790309e6e63e755d03b2c85
 2014-04-22 00:04:39 +00:00
Craig Mautner
6985badc63 Fix black ActivityView 
Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2
 2014-04-21 15:28:43 -07:00
Craig Mautner
6cdf51f21d Don't use finalize on ActivityView to cleanup. 
Use a static object to contain the IActivityContainer reference
rather than storing it directly in the ActivityView itself. Then
when the ActivityView gives up the reference we can use a clean
finalize() call to release the IActivityContainer.

Fixes bug 14184756.

Change-Id: I7e05fcce3040b2b958f7c9cd030d5e3b745f3169
 2014-04-21 15:28:43 -07:00
Craig Mautner
f4c909bcb8 Fix ActivityView lifecycle 
Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
 2014-04-21 15:28:42 -07:00
Jeff Tinker
e618f18473 am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 
* commit '72eec7f6c9509fb86f46fbdb619523efacb8d02e':
  Allow DRM plugins to be destroyed when released
 2014-04-21 21:02:28 +00:00
Jeff Tinker
72eec7f6c9 Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 2014-04-21 20:58:49 +00:00
Adam Lesinski
a281be6703 am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit '370cda7074a02139fa5374bbdd94c37be376ca7a':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:21:13 +00:00
Adam Lesinski
370cda7074 Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 2014-04-21 20:18:11 +00:00
Jesse Hall
43cea7eadb am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit '650a8860d9732accd938a32f99179cc86f101ef4':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:46:01 +00:00
Jesse Hall
650a8860d9 am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit 'fc3c6a0ef36cc4969aa7d8e160cc55f30c653325':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:41:29 +00:00
Jesse Hall
fc3c6a0ef3 Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 2014-04-21 19:38:45 +00:00
Ariel Gertzenstein
6788110191 am fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev 
* commit 'fe7550548d036b6c536840fd1daa954160d0b2c8':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
 2014-04-21 18:47:40 +00:00
Ariel Gertzenstein
fe7550548d Merge "DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev 2014-04-21 18:41:53 +00:00
Ariel Gertzenstein
a2d8706ca8 DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request 
after establishing a PANU connection.

http://b/13731957

Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
 2014-04-21 14:26:56 -04:00
Baligh Uddin
43ca5efaf0 Import translations. DO NOT MERGE 
Change-Id: Ieb3e0b6128807111d32faa3681839723fd47e8f1
Auto-generated-cl: translation import
 2014-04-21 11:19:33 -07:00
Mike Lockwood
f82c83a8de am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e':
  MTP: Fix getThumbnail
 2014-04-21 16:44:49 +00:00
Mike Lockwood
eaabdce0ad am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521':
  MTP: Fix getThumbnail
 2014-04-21 16:40:18 +00:00
Mike Lockwood
ca1f8f6d14 am c4367721: MTP: Fix getThumbnail 
* commit 'c436772120ceea1d6e3f5b388ef068c99c8bb7d6':
  MTP: Fix getThumbnail
 2014-04-21 16:31:51 +00:00
Mike Lockwood
c436772120 MTP: Fix getThumbnail 
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.

Bug: 13747419

Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
 2014-04-21 08:54:45 -07:00
Ying Wang
717884ea10 am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '9df9ad7e29aecf88fdeb026bda07963ab6789396':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 13:45:33 +00:00
Ying Wang
9df9ad7e29 am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '2a52862db5257edcafa137276ce3d8dc54cd443e':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 13:35:26 +00:00
Ying Wang
2a52862db5 Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 2014-04-19 00:07:49 +00:00
Kenny Root
54e236f9b8 am 0090082e: resolved conflicts for merge of 89a086c1 to klp-modular-dev 
* commit '0090082ed040dd3ea897cf13d7e837dadd06ca3f':
  Use hidden API to validate APK chains
 2014-04-19 00:02:04 +00:00
Ying Wang
38250d9b84 Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs. 
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
 2014-04-18 16:39:47 -07:00
Elliott Hughes
36e64ab902 am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit 'cf4d85e4786beb98743eac68b71d67e36f76c058':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:26:16 +00:00
Elliott Hughes
cf4d85e478 am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit '90840ec29dec173f5fbc8197bcf1889bde5bd262':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:20:21 +00:00
Elliott Hughes
90840ec29d Merge "Fix warning introduced by recent psuedolocalizer change." 2014-04-18 23:16:44 +00:00
Elliott Hughes
0a1eed394f Fix warning introduced by recent psuedolocalizer change. 
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
 2014-04-18 16:15:27 -07:00
Kenny Root
0090082ed0 resolved conflicts for merge of 89a086c1 to klp-modular-dev 
Change-Id: Iaa82bfc87fb3af2e8e78597c6f2517e7dad7c130
 2014-04-18 16:15:13 -07:00
Kenny Root
89a086c16f am cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'cf677a37fb4560058fe29ebcac97f2c02bd55064':
  Use hidden API to validate APK chains
 2014-04-18 23:05:30 +00:00
Kenny Root
cf677a37fb am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'e00c9185262c675f1680920c258413299995042a':
  Use hidden API to validate APK chains
 2014-04-18 23:00:37 +00:00
Elliott Hughes
56ca821912 resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp 
Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94
 2014-04-18 15:56:46 -07:00
Kenny Root
e00c918526 am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
  Use hidden API to validate APK chains
 2014-04-18 22:56:26 +00:00
Kenny Root
41ec218e5f am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
  Use hidden API to validate APK chains
 2014-04-18 22:50:12 +00:00
Kenny Root
6888bee598 am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '5a0cc78929bf56c153696ffa16b602acfcc40089':
  Use hidden API to validate APK chains
 2014-04-18 22:43:08 +00:00
Kenny Root
5a0cc78929 am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
  Use hidden API to validate APK chains
 2014-04-18 22:37:38 +00:00
Elliott Hughes
ec42199a71 am 92b2d5a6: Merge "Pseudolocalizer improvements." 
* commit '92b2d5a608f9fefc9a88eea03cd599a26c1b62ce':
  Pseudolocalizer improvements.
 2014-04-18 22:36:32 +00:00
Elliott Hughes
92b2d5a608 Merge "Pseudolocalizer improvements." 2014-04-18 22:32:53 +00:00
Kenny Root
2ed5f771c4 am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '47231936c0593b87c3c9898767327f1516a7ec22':
  Use hidden API to validate APK chains
 2014-04-18 22:31:08 +00:00