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

112033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
9a160a52b9 am e182bfd4: Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-dev 
* commit 'e182bfd4dcf35d5009bcae72356b999b5ead0433':
  Prevent NPE when cloning gradients Bug #10436856
 2013-09-03 16:35:53 -07:00
Alan Viverette
de59baab31 Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 2013-09-03 23:33:03 +00:00
Romain Guy
e182bfd4dc Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-dev 2013-09-03 23:32:33 +00:00
Alan Viverette
de213f708f Add methods for managing subtitle overlays in VideoView 
Overlays are added directly to the VideoView, laid out to the
size of the video view, and rendered in draw().

BUG: 10260603
Change-Id: Ie8c30e5e6dcd5c6e1a2063af898afce0108a87bf
 2013-09-03 16:18:42 -07:00
Romain Guy
9622adf6e8 Prevent NPE when cloning gradients 
Bug #10436856

Change-Id: I98cbce941a06842112b8caa3753a3fa32b227da9
 2013-09-03 16:08:00 -07:00
Alan Viverette
ba29906334 Ensure list scrolling API is in parity with view scrolling API 
Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
 2013-09-03 16:01:51 -07:00
Lajos Molnar
a7cd8835bb am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev 
* commit 'a861245f06e854d47ff44155ebd3ac0e31c0cb2c':
  VideoView: add addSubtitleSource
 2013-09-03 15:53:28 -07:00
Lajos Molnar
a861245f06 Merge "VideoView: add addSubtitleSource" into klp-dev 2013-09-03 22:51:32 +00:00
Matthew Xie
171f8be412 am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev 
* commit '02a25a97a24e06768159ddc2b680c253a2ce71c7':
  Block ble adv api based on resource config
 2013-09-03 15:40:14 -07:00
Matthew Xie
02a25a97a2 Merge "Block ble adv api based on resource config" into klp-dev 2013-09-03 22:36:09 +00:00
Dianne Hackborn
2f3a88b4df am f0abed57: Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 
* commit 'f0abed57397c18f71efe47f02aa69a719390adb5':
  Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY
 2013-09-03 15:06:05 -07:00
Dianne Hackborn
f0abed5739 Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 2013-09-03 22:04:44 +00:00
Alan Viverette
5d46c89e3c Implement drag-to-open in ActivityChooserView 
BUG: 10606456
Change-Id: I9ac0c5076bb1bf6c3f8a674bb2ef998d8515e8d9
 2013-09-03 14:56:26 -07:00
Dianne Hackborn
d318e0b19f Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY 
Maybe adding more words will make it more clear. :)

Change-Id: Ie729eaba1df542d4ffcd0502ccba3807d641fd72
 2013-09-03 14:55:01 -07:00
Romain Guy
3d179241bf am 3e8105e2: Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-dev 
* commit '3e8105e212e65005c0ef0ecc345b47eb0bf129bd':
  Update Bitmap.Config.ARGB_4444 documentation Bug #10510122
 2013-09-03 14:46:25 -07:00
Romain Guy
3e8105e212 Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-dev 2013-09-03 21:41:39 +00:00
Jeff Sharkey
ded77187ef Updated documents UX around action bar. 
Change action bar to match current design; drawer is always available
and navigation dropdown is used to interact with current traversal
path in hierarchy.  On first launch, show recents with drawer
expanded.  On subsequent launches, resume from last location with
drawer closed.  If last location root isn't applicable, then behave
like initial launch.  Move sort order into action bar submenu.

Delete documents using contract.  Use unstable provider when
inflating DocumentInfo from Uri.

Bug: 10330219, 10510851
Change-Id: I6e94637d70ebca156a6c5d50272e878156d0dd62
 2013-09-03 14:17:10 -07:00
Craig Mautner
583e8f2528 am 59f6b510: Merge "Insert home task into history when sending to back." into klp-dev 
* commit '59f6b510569a4c70c43c5b9b80fa70d5a28d99f0':
  Insert home task into history when sending to back.
 2013-09-03 14:08:31 -07:00
Craig Mautner
59f6b51056 Merge "Insert home task into history when sending to back." into klp-dev 2013-09-03 21:06:49 +00:00
John Spurlock
5fd3988342 am cbd067e8: Merge "Dim status icons / battery / clock on opaque bars." into klp-dev 
* commit 'cbd067e87537874ce216c02cab2ab46b5980b634':
  Dim status icons / battery / clock on opaque bars.
 2013-09-03 13:35:29 -07:00
John Spurlock
cbd067e875 Merge "Dim status icons / battery / clock on opaque bars." into klp-dev 2013-09-03 20:30:48 +00:00
Tom O'Neill
24bd1740df am d0e2a2e7: Merge "Improve constant names for settings injection API" into klp-dev 
* commit 'd0e2a2e7a9a6c247f501a5044d1c19cd82c6129d':
  Improve constant names for settings injection API
 2013-09-03 13:28:24 -07:00
Tom O'Neill
d0e2a2e7a9 Merge "Improve constant names for settings injection API" into klp-dev 2013-09-03 20:25:56 +00:00
Amith Yamasani
882bfb9dda am 7eed075a: Merge "Don\'t call setLastChosen if it\'s a chooser activity instance" into klp-dev 
* commit '7eed075a43479ea646821c798b61b49bf53945b3':
  Don't call setLastChosen if it's a chooser activity instance
 2013-09-03 13:24:52 -07:00
John Spurlock
e6f0a71650 Dim status icons / battery / clock on opaque bars. 
Apply consistent alpha to the other status bar elements
now that they are intrinsically brighter than before.

Bug:10602822
Change-Id: I8ca6ddc844f9c58ddf2a1df8d1a5bd7fb71932d1
 2013-09-03 16:23:49 -04:00
Amith Yamasani
7eed075a43 Merge "Don't call setLastChosen if it's a chooser activity instance" into klp-dev 2013-09-03 20:22:15 +00:00
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
Justin Koh
0dc6733e3f Add keypress invalid to all AudioPackage mk files. 
Add keypress invalid to all AudioPackage mk files.
Bug: 10571332

Change-Id: I3999b124a97869da567200d3588087a9fdc1b8d8
 2013-09-03 12:58:43 -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