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

111956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
c8143c623d Insert home task into history when sending to back. 
- There is an assumption that moving a task to the back moves it
behind the home activity. This fix ensures that the home activity
will be launched by some activity before the task that has been
moved to the back.

- Convert "private final" declarations to private only.

- Convert container tests for size()==0 to isEmpty().

- Remove unused variable.

Fixes bug 10228536.

Change-Id: I51741ee7a09652e27afffcc50c14953bf0aa27ea
 2013-09-03 13:14:57 -07:00
Jeff Sharkey
94046882b9 am 8a05d041: Merge "Remove deprecated ACCESS_DRM permission." into klp-dev 
* commit '8a05d041c0f6caaa7086cab79340c100f1678fca':
  Remove deprecated ACCESS_DRM permission.
 2013-09-03 12:44:49 -07:00
Jeff Sharkey
8a05d041c0 Merge "Remove deprecated ACCESS_DRM permission." into klp-dev 2013-09-03 19:42:13 +00:00
Martijn Coenen
e22cb840d5 am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev 
* commit 'b143c66987d596d9101a5b12fcd7572d4a6026fb':
  Add drawable for Apdu Services, fix build.
 2013-09-03 12:32:07 -07:00
Amith Yamasani
588dd2a3d6 Don't call setLastChosen if it's a chooser activity instance 
Bug: 10605359
Change-Id: If76f5cf2f45442dc25f9bfbd20a4d671b9caa358
 2013-09-03 12:31:42 -07:00
Martijn Coenen
b143c66987 Merge "Add drawable for Apdu Services, fix build." into klp-dev 2013-09-03 19:29:46 +00:00
Michael Wright
18e14c75e3 Fix keymap build dependencies and variable name collisions 
Change-Id: I06e67ddc97429ae9c3d04143934c3f8233fcd22f
 2013-09-03 12:27:18 -07:00
Martijn Coenen
c85fb576b8 Add drawable for Apdu Services, fix build. 
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
 2013-09-03 12:24:18 -07:00
John Spurlock
b893af6d06 am bfa29c71: Merge "Don\'t ever disable the status/nav bar." into klp-dev 
* commit 'bfa29c7181d4b811cb39dbd013c45ff653d8a5f4':
  Don't ever disable the status/nav bar.
 2013-09-03 12:14:58 -07:00
John Spurlock
bfa29c7181 Merge "Don't ever disable the status/nav bar." into klp-dev 2013-09-03 19:12:55 +00:00
Jeff Sharkey
6fddfa163b am 7f15b03d: Merge "Skip packages with missing metadata." into klp-dev 
* commit '7f15b03d1636fefd6e02a3c89aa98e42483acdab':
  Skip packages with missing metadata.
 2013-09-03 12:07:26 -07:00
Jeff Sharkey
7f15b03d16 Merge "Skip packages with missing metadata." into klp-dev 2013-09-03 19:04:56 +00:00
Jeff Sharkey
9c104ab454 Remove deprecated ACCESS_DRM permission. 
The permission no longer exists, so don't assign it to media.

Bug: 9967611
Change-Id: I5e11fcfc265310cbc3c2a8812a13e68b717fa476
 2013-09-03 12:04:39 -07:00
Jeff Sharkey
5dea7d554a Skip packages with missing metadata. 
Otherwise this would result in NPE, and packages.list would never
be updated.

Bug: 10577538
Change-Id: I35a4407dbc283ab20a4c45a2ea1a14b04044c98c
 2013-09-03 12:01:20 -07:00
Kristian Monsen
b5539b68fc am 073ff1a6: Merge "Add tracing to WebView API methods and callbacks" into klp-dev 
* commit '073ff1a6634b36727af4d00db1a3aef3c8a62568':
  Add tracing to WebView API methods and callbacks
 2013-09-03 11:57:17 -07:00
Kristian Monsen
073ff1a663 Merge "Add tracing to WebView API methods and callbacks" into klp-dev 2013-09-03 18:54:50 +00:00
Dirk Dougherty
001755a1de am e725d37d: am 7081684f: am c236f992: am 5e52ee6e: Doc change: small refinement of brand usage guidelines. 
* commit 'e725d37d48d411e8588b7476314f33718b7a719a':
  Doc change: small refinement of brand usage guidelines.
 2013-09-03 11:53:53 -07:00
Dirk Dougherty
e725d37d48 am 7081684f: am c236f992: am 5e52ee6e: Doc change: small refinement of brand usage guidelines. 
* commit '7081684f17a3ec768b6048434f47578631249de6':
  Doc change: small refinement of brand usage guidelines.
 2013-09-03 11:50:57 -07:00
Romain Guy
25ba1c8694 Update Bitmap.Config.ARGB_4444 documentation 
Bug #10510122

ARGB_4444 is deprecated and always replaced with ARGB_8888.

Change-Id: I0da96216af701a7df00ad35913066fbfa997d790
 2013-09-03 11:50:23 -07:00
Martijn Coenen
a3c92d65de am fb2f8337: NFC: @hide and remove abstract from processCommandApdu(). 
* commit 'fb2f8337f6fca9809156ddbaf0a7fe468bc1329f':
  NFC: @hide and remove abstract from processCommandApdu().
 2013-09-03 11:49:27 -07:00
Dirk Dougherty
7081684f17 am c236f992: am 5e52ee6e: Doc change: small refinement of brand usage guidelines. 
* commit 'c236f99234bbcc9b1ced14777b179adb59922b0f':
  Doc change: small refinement of brand usage guidelines.
 2013-09-03 11:48:34 -07:00
Dirk Dougherty
c236f99234 am 5e52ee6e: Doc change: small refinement of brand usage guidelines. 
* commit '5e52ee6ecf08b299b433104798e736e2bc3904d5':
  Doc change: small refinement of brand usage guidelines.
 2013-09-03 11:44:24 -07:00
John Spurlock
686820a402 Don't ever disable the status/nav bar. 
Revert part of the fix for b/8682123 until we figure out why
the window state does not flip to SHOWING in BarController.

Bug:10488453
Change-Id: Ic5d60a6d945b470fd519dc01de30690e61c62e01
 2013-09-03 14:44:16 -04:00
Martijn Coenen
fb2f8337f6 NFC: @hide and remove abstract from processCommandApdu(). 
Replaced by new version with Bundle extras.

Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
 2013-09-03 11:40:35 -07:00
Mindy Pereira
47fd325779 am 5c2dfa8a: Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev 
* commit '5c2dfa8a21e7bd4e07e00f268d30058b654aa099':
  Fix build; add new ScaleGestureDetector constructor
 2013-09-03 11:33:57 -07:00
Dirk Dougherty
5e52ee6ecf Doc change: small refinement of brand usage guidelines. 
Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
 2013-09-03 11:32:09 -07:00
Mindy Pereira
5c2dfa8a21 Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev 2013-09-03 18:32:02 +00:00
Mindy Pereira
6ad955ef97 Fix build; add new ScaleGestureDetector constructor 
Change-Id: I1b6e7ef36ce79852acd6cefe03fc94143641ff0e
 2013-09-03 11:27:02 -07:00
Svetoslav Ganov
38c5b2b879 am ad0ec16f: Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev 
* commit 'ad0ec16fbe27e69e22b90ad9f1b9e322d8c20e8d':
  Bug fixes in the printer dialog activity and fused printer loader.
 2013-09-03 11:04:19 -07:00
Svetoslav Ganov
d0871ac62f am e1de4b32: Merge "Crashes in TouchExplorer on two finger swipe." into klp-dev 
* commit 'e1de4b3216055d53e21ace27c0281359847332a2':
  Crashes in TouchExplorer on two finger swipe.
 2013-09-03 11:04:16 -07:00
Svetoslav Ganov
ad0ec16fbe Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev 2013-09-03 18:02:58 +00:00
Svetoslav Ganov
e1de4b3216 Merge "Crashes in TouchExplorer on two finger swipe." into klp-dev 2013-09-03 18:02:15 +00:00
Santos Cordon
8bd2eb314b am 90a5df1e: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit '90a5df1ee8c89ca17df93d9ecf95652b2ae619f4':
  Revert "Add permissions for the InCallUI Split."
 2013-09-03 10:49:15 -07:00
Mindy Pereira
197602ded7 am 510caf30: Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 
* commit '510caf30d2f7b240ee0cb470f52299af8576ea8d':
  Add doubletap swipe to scalegesturedetector
 2013-09-03 10:49:12 -07:00
Leon Scroggins III
050129b44a am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev 
* commit '3f8da09136087bd4f97c1e13e2fb7f8cfb81941c':
  Change name back to CreateJavaInputStreamAdaptor.
 2013-09-03 10:49:07 -07:00
Jeff Tinker
82bdd3f703 am f2455df4: Merge "Revert "Enhancement for OnInfo callback on DRM Framework"" into klp-dev 
* commit 'f2455df4f85a2b02dee0da1a711e3b1292126c97':
  Revert "Enhancement for OnInfo callback on DRM Framework"
 2013-09-03 10:49:04 -07:00
Kenny Root
627f28c015 resolved conflicts for merge of 7e0609eb to klp-dev-plus-aosp 
Change-Id: I9d8fcccc51a61f769bde2c9912eea16a4b4df001
 2013-09-03 10:46:09 -07:00
Santos Cordon
90a5df1ee8 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-03 17:43:29 +00:00
Santos Cordon
b6c46d2381 Revert "Add permissions for the InCallUI Split." 
This reverts commit bf84eb5ed579d13b74c97b995299ca61cafedea6.

Change-Id: I40e311174898a741f5053501290833420355ad03
 2013-09-03 17:42:04 +00:00
Mindy Pereira
510caf30d2 Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 2013-09-03 17:38:36 +00:00
Leon Scroggins III
3f8da09136 Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev 2013-09-03 17:37:10 +00:00
Jeff Tinker
f2455df4f8 Merge "Revert "Enhancement for OnInfo callback on DRM Framework"" into klp-dev 2013-09-03 17:35:57 +00:00
Kenny Root
7e0609eb67 Merge changes Ic710807d,I88dfcc8c into klp-dev 
* changes:
  Unhide functions to allow ECDSA support
  Add support for DSA and ECDSA key types
 2013-09-03 17:28:41 +00:00
Martijn Coenen
ca12d4556c am dd592e2a: Merge "HCE API review." into klp-dev 
* commit 'dd592e2a0d731c061d316a2286084a6a59633390':
  HCE API review.
 2013-09-03 10:28:26 -07:00
Martijn Coenen
dd592e2a0d Merge "HCE API review." into klp-dev 2013-09-03 17:25:01 +00:00
Jean-Michel Trivi
85d8eb6916 am 4a5931e2: Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev 
* commit '4a5931e2ae3ce0e117dcdbbb47e9aaa5ce4a35dc':
  Public API for RemoteControlClient ratings and editable metadata
 2013-09-03 10:24:53 -07:00
Jean-Michel Trivi
4a5931e2ae Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev 2013-09-03 17:19:55 +00:00
Baligh Uddin
d99d648156 Import translations. DO NOT MERGE 
Change-Id: Icaf13bfca4c997cd0b1bddc91c96351cb5d5a20e
Auto-generated-cl: translation import
 2013-09-03 10:16:06 -07:00
Jeff Tinker
490dd056bd Revert "Enhancement for OnInfo callback on DRM Framework" 
This reverts commit 6fd97b7d93c5eeaefb2695786b35d1672c88b0cf.

Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video
bug: 10542864

Change-Id: I85b84d6b602079571be1a7237c907716db9cdf54
 2013-09-03 10:13:17 -07:00
Baligh Uddin
8213e34b14 Import translations. DO NOT MERGE 
Change-Id: I17ec3c595dbf7291f781fa73ce5772d2a647ae91
Auto-generated-cl: translation import
 2013-09-03 10:07:16 -07:00