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

128966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
11e41baac6 Overriding application icon with activity icon where available. 
Change-Id: I03ee8f806b3853183db7f96e71f1684c72b79c57
 2014-04-21 12:40:52 -07: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
deb1f268b7 Merge "Initial changes to add search bar." 2014-04-21 19:26:09 +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
Baligh Uddin
34ae173135 Import translations. DO NOT MERGE 
Change-Id: Ia71c43ac8689fae4207cf040dc75966c75136326
Auto-generated-cl: translation import
 2014-04-21 11:43:53 -07: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
Winson Chung
9520d1abd4 Fixing transition from tasks excluded from Recents into Recents. 
Change-Id: I04efdd65bcda4d0111888a1c5651d1ec9b0c98b0
 2014-04-21 11:30:56 -07: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
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
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
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
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
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
Ji-Hwan Lee
26bdb8fb6c Add config resource to add inital mock location providers 
So that we can provide mock location providers, e.g., in emulator build.

Change-Id: Ia8fe0925abc2faa4999ef17e386d7f3f8b13a0dc
 2014-04-21 20:49:42 +09: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
Christopher Tate
740888f62e Handle /oem and /vendor as well 
Bug 13170859

Change-Id: I95dec4cd68e3d64517d08b3f08eefb849ce37b86
 2014-04-18 17:50:29 -07:00
Jianing Wei
baf0c650b3 Camera2 API: fix bug in Camera2 CTS test failure. 
* The bug is caused by the fact that we did not update the frame
  tracker when the listener is null or camera is closed.
* This change fixes the bug 14151933.

Bug: 14151933
Change-Id: I00e3024e403503a056834be805c44604cb1a8a6d
 2014-04-18 17:35:00 -07:00
Ying Wang
2a52862db5 Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 2014-04-19 00:07:49 +00:00
Kenny Root
818e90a972 am 54e236f9: am 0090082e: resolved conflicts for merge of 89a086c1 to klp-modular-dev 
* commit '54e236f9b8d6ee8459c98497d81a4feb48f0e82d':
  Use hidden API to validate APK chains
 2014-04-19 00:04:56 +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
5a63d11902 am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit '36e64ab902a6932f2711d1dff6ee273610d68e7d':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:30:27 +00: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
Andreas Gampe
7006860b4a Merge "PacProccesor: Only build for 32-bit" 2014-04-18 23:23:02 +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
Andreas Gampe
f8749200c0 PacProccesor: Only build for 32-bit 
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.

Change-Id: I034932343b9aef239748511d8deb498b46e77cf2
 2014-04-18 23:12:39 +00:00
Deepanshu Gupta
311efc146c Merge "Add DisplayManager service to BridgeContext" 2014-04-18 23:11:57 +00:00
Deepanshu Gupta
991872bd43 Merge "Add isElegantHeight to Layoutlib" 2014-04-18 23:11:27 +00:00
Elliott Hughes
4b0ee78bfa resolved conflicts for merge of 56ca8219 to master 
Change-Id: I62f5804a5c4404eedce09188cda2e3b1bb990b36
 2014-04-18 16:07:41 -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
Deepanshu Gupta
664d6f1fe4 Add DisplayManager service to BridgeContext 
ViewRoot now holds a reference to the DisplayManager. The change updates
the BridgeContext to provide the DisplayManager instance.

Change-Id: I4a5f00eda337939c72bad47b0ca6a7403454228d
 2014-04-18 16:03:11 -07: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