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

131670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
1d947a9b41 am 2152a2c5: am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 
* commit '2152a2c5f93872eac268306dc675558b2489d270':
  Allow DRM plugins to be destroyed when released
 2014-04-21 21:08:53 +00:00
Jeff Tinker
2152a2c5f9 am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev 
* commit 'e618f184733e745df4cf86019d23e085559e0f2c':
  Allow DRM plugins to be destroyed when released
 2014-04-21 21:06:13 +00: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
Dianne Hackborn
129e1dc6d0 am ec687133: Merge "Try to always print time stamp in battery history." 
* commit 'ec687133e01d6650d630511ce96f184c6d829482':
  Try to always print time stamp in battery history.
 2014-04-21 20:56:53 +00:00
Dianne Hackborn
ec687133e0 Merge "Try to always print time stamp in battery history." 2014-04-21 20:52:49 +00:00
Adam Lesinski
892bf987f3 am 49d8fa47: am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit '49d8fa473970265a182549cc1673719e5101320e':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:29:19 +00:00
Adam Lesinski
49d8fa4739 am a281be67: am 370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev 
* commit 'a281be67030a834d455a84ce62c173140564211a':
  Allow InputEvents to propagate w/o IME
 2014-04-21 20:25:03 +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
Dianne Hackborn
99009ea7dc Try to always print time stamp in battery history. 
Also fix printing of string pool to quote the strings
and escape characters, and change history time stamps
to print starting at 0 and going up.

Change-Id: I2d0c080f2b5de7b27b20a7357c2c0cf481c82d8c
 2014-04-21 13:10:38 -07:00
Jesse Hall
f9f4975fea am 4660c9e0: am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit '4660c9e064ebaec9ebb260c2853a8dab868ccdc2':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:53:10 +00:00
Colin Cross
0030efa975 am 95c95082: Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" 
* commit '95c950825f02e937711fbcbff63f614a91cb1443':
  BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG
 2014-04-21 19:53:06 +00:00
Jesse Hall
4660c9e064 am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested." 
* commit '43cea7eadbcb3930887eadfa3f278e1a666449d0':
  EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
 2014-04-21 19:49:40 +00:00
Colin Cross
95c950825f Merge "BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG" 2014-04-21 19:47:32 +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
Winson Chung
1978da4200 am deb1f268: Merge "Initial changes to add search bar." 
* commit 'deb1f268b7fc71ed23bac76af7dac6b5b04e8340':
  Initial changes to add search bar.
 2014-04-21 19:31:11 +00:00
Winson Chung
deb1f268b7 Merge "Initial changes to add search bar." 2014-04-21 19:26:09 +00:00
Ariel Gertzenstein
1544c71482 am ad7b890f: am 67881101: (-s ours) 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 'ad7b890f59d0493fb1d011c22721d68e2d22bf38':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
 2014-04-21 18:55:48 +00:00
Ariel Gertzenstein
ad7b890f59 am 67881101: (-s ours) 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 '6788110191fc457169d8268a4c25e1845d05ee07':
  DO NOT MERGE    Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
 2014-04-21 18:50:25 +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
Dan Sandler
1c3dbc66e4 am 2146b914: Merge "Avoid NPE when mRoot is null." 
* commit '2146b91404bfe8274bb8b37bfea1d9b8059cdd12':
  Avoid NPE when mRoot is null.
 2014-04-21 17:47:23 +00:00
Dan Sandler
2146b91404 Merge "Avoid NPE when mRoot is null." 2014-04-21 17:39:31 +00:00
Dan Sandler
9ee256d252 Avoid NPE when mRoot is null. 
Bug: 14162288
Change-Id: I36793d706ab1d29576f536562a0c06f7805a0d50
 2014-04-21 17:34:49 +00:00
Mike Lockwood
2ad341b527 am 3fafb4eb: am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit '3fafb4ebf2572578c6d7df742593ee5ed17748a8':
  MTP: Fix getThumbnail
 2014-04-21 16:53:10 +00:00
Mike Lockwood
3fafb4ebf2 am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail 
* commit 'f82c83a8debb468027921e4b479bf80fe7f04ee1':
  MTP: Fix getThumbnail
 2014-04-21 16:47:41 +00: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
Ying Wang
9953012f75 am 6fca81de: am 717884ea: (-s ours) am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '6fca81de9b2079ec88e785f58bf49bf1f0c105e2':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 16:10:18 +00:00
Ying Wang
6fca81de9b am 717884ea: (-s ours) am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 
* commit '717884ea102e2ba7f4d35e25cc2486fd18e8a0d1':
  Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
 2014-04-21 16:06:05 +00:00
John Spurlock
ec920b2927 am 06661993: Merge "Quick settings bug fixes." 
* commit '06661993037c28d2e189bfe809304a5d0e3ba5d8':
  Quick settings bug fixes.
 2014-04-21 15:59:32 +00:00
John Spurlock
3aba4b2d49 am 50728832: Remove obsolete settings panel artifacts. 
* commit '507288322b11ae27ab8f47438d3ef4203dad0192':
  Remove obsolete settings panel artifacts.
 2014-04-21 15:59:28 +00:00
John Spurlock
0666199303 Merge "Quick settings bug fixes." 2014-04-21 15:56:25 +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
Alan Viverette
4eec347b3c am 307ad092: Add alpha to bitmap, nine patch drawable, fix container hot spots 
* commit '307ad09228ebf70f1b456f5f00540c0126277850':
  Add alpha to bitmap, nine patch drawable, fix container hot spots
 2014-04-21 13:37:31 +00:00
Jianing Wei
f1fa3bb824 am 2bcd4023: Merge "Camera2 API: fix bug in Camera2 CTS test failure." 
* commit '2bcd40235e5a9a73adfb3f685fe78577b35d3ba5':
  Camera2 API: fix bug in Camera2 CTS test failure.
 2014-04-21 13:37:27 +00:00
Christopher Tate
3405022b0a am 23975123: Merge "Handle /oem and /vendor as well" 
* commit '239751237c3431c9b9683fc08219c05f884f37d8':
  Handle /oem and /vendor as well
 2014-04-21 13:37:24 +00:00
Kenny Root
65dc5e7428 am 818e90a9: am 54e236f9: am 0090082e: resolved conflicts for merge of 89a086c1 to klp-modular-dev 
* commit '818e90a9721f474427fa95782ca51a30fdf2fadc':
  Use hidden API to validate APK chains
 2014-04-21 13:37:20 +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
John Spurlock
f0b06c7738 Quick settings bug fixes. 
- Fix issue where notifications were positioned offscreen after
   quick screen toggle.
 - Better QS scrim hiding, use existing layout transition.
 - Don't allow a reposition if the settings animation is currently
   running.
 - Delay chevron animation during toggle to avoid drawing over each
   other.
 - Keep the screen on while the user is poking around with QS on
   the keyguard.
 - Cap the QS expansion to the bottom of the status view on keyguard.

Change-Id: Ib63874d0c6a33db81923080f25cb8f208e614faf
 2014-04-21 07:16:40 -04:00
John Spurlock
507288322b Remove obsolete settings panel artifacts. 
I don't always have quick settings.  But when I do,
they live in a flip view, not a separate panel.

Bug:14133785
Change-Id: I3df11d7de308a36a800eb7582a71e3febc897fec
 2014-04-21 07:16:15 -04:00
Alan Viverette
307ad09228 Add alpha to bitmap, nine patch drawable, fix container hot spots 
Also fixes primary text disabled state alpha.

BUG: 13818888
Change-Id: I9ae2e25216014177c2dac24f5c9095df87724a43
 2014-04-19 16:01:58 -07:00
Jianing Wei
2bcd40235e Merge "Camera2 API: fix bug in Camera2 CTS test failure." 2014-04-19 01:21:56 +00:00
Christopher Tate
239751237c Merge "Handle /oem and /vendor as well" 2014-04-19 00:55:08 +00:00