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

104114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
e6bec854d5 am 3793b928: am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 
* commit '3793b92816d940b265468e9f2f071fbf35db534d':
  Have audio service clean up new receivers in crashing processes.
 2013-04-08 13:24:28 -07:00
Dianne Hackborn
3793b92816 am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 
* commit 'bc948101043b3c4b57eb6e0e2421494fd7c1d41e':
  Have audio service clean up new receivers in crashing processes.
 2013-04-08 13:20:02 -07:00
Nick Kralevich
9babf58c30 am c2fba075: am 8e181c56: Merge "AppSecurityPermissions: minor UI changes" into jb-mr2-dev 
* commit 'c2fba0750df431bb44a6873f04aac2d3e8e75de3':
  AppSecurityPermissions: minor UI changes
 2013-04-08 13:17:24 -07:00
John Spurlock
c6ff35c76f am fc9b371e: am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr2-dev 
* commit 'fc9b371e90545c9be46730a9d3ab555edfa7da39':
  Awaken dreams on home + recents.
 2013-04-08 13:13:51 -07:00
Nick Kralevich
c2fba0750d am 8e181c56: Merge "AppSecurityPermissions: minor UI changes" into jb-mr2-dev 
* commit '8e181c56b3abc4e57f178849a8b6cef750913d5a':
  AppSecurityPermissions: minor UI changes
 2013-04-08 13:13:06 -07:00
Dianne Hackborn
bc94810104 Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 2013-04-08 20:10:37 +00:00
John Spurlock
fc9b371e90 am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr2-dev 
* commit '04c83357c3dee87f08e63a11e67e89d78df81938':
  Awaken dreams on home + recents.
 2013-04-08 13:09:35 -07:00
Nick Kralevich
8e181c56b3 Merge "AppSecurityPermissions: minor UI changes" into jb-mr2-dev 2013-04-08 20:08:59 +00:00
Dianne Hackborn
79f7ec70eb Have audio service clean up new receivers in crashing processes. 
The new media button receiver with only a pending intent (no
component name) could be left hanging if the process that
registered it went away.  These semantically need to be tied
to the calling process's lifetime; we now clean them up when
the calling process goes away.

Also added some additional cleanup of media button receivers
when packages change (updated, cleared).

And on top of that, a new "media" command for doing media
things.  Currently lets you send media keys and monitor
remote display data.

Oh and finally added a new BaseCommand base class for
implementing these command line utilities.

Change-Id: Iba1d56f10bab1eec4a94a7bb1d1c2ae614c8bcf5
 2013-04-08 13:08:37 -07:00
John Spurlock
04c83357c3 Merge "Awaken dreams on home + recents." into jb-mr2-dev 2013-04-08 20:05:50 +00:00
ztenghui
15a981b0d3 am 8bfa40ae: am 7ce7b006: Merge "HTML5Audio should handle content URI" into jb-mr2-dev 
* commit '8bfa40aea7e6bcb5de17b0110ba5bce05f20f2a8':
  HTML5Audio should handle content URI
 2013-04-08 13:04:44 -07:00
Romain Guy
50dde857ed am 0899f11d: am dcaa9436: Merge "Always take padding and margins into account Bug #8565842" into jb-mr2-dev 
* commit '0899f11db1f10b1ac664cb4bb62b829ea464cac8':
  Always take padding and margins into account Bug #8565842
 2013-04-08 13:04:41 -07:00
ztenghui
8bfa40aea7 am 7ce7b006: Merge "HTML5Audio should handle content URI" into jb-mr2-dev 
* commit '7ce7b0068c869408003f512a4e04cc73be2f7c69':
  HTML5Audio should handle content URI
 2013-04-08 13:00:35 -07:00
Romain Guy
0899f11db1 am dcaa9436: Merge "Always take padding and margins into account Bug #8565842" into jb-mr2-dev 
* commit 'dcaa9436fe8d5f4baeea5a09106cdf8a445d9a9b':
  Always take padding and margins into account Bug #8565842
 2013-04-08 13:00:33 -07:00
ztenghui
7ce7b0068c Merge "HTML5Audio should handle content URI" into jb-mr2-dev 2013-04-08 19:58:22 +00:00
Romain Guy
dcaa9436fe Merge "Always take padding and margins into account Bug #8565842" into jb-mr2-dev 2013-04-08 19:57:04 +00:00
Romain Guy
76d59a3b7b Always take padding and margins into account 
Bug #8565842

Change-Id: I8ee398b5c36b3011950265eb7e22cc8338f1aeee
 2013-04-08 12:56:15 -07:00
Daniel Sandler
a92c7971b1 am 684d24cf: am dc634351: Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev 
* commit '684d24cf664330288d7e91d33e0d8426bb3960e0':
  Clean up language in forced foreground service notifications.
 2013-04-08 12:55:36 -07:00
Daniel Sandler
684d24cf66 am dc634351: Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev 
* commit 'dc634351d4f8a59e4b5743c58571d1ef04da668a':
  Clean up language in forced foreground service notifications.
 2013-04-08 12:51:33 -07:00
Daniel Sandler
dc634351d4 Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev 2013-04-08 19:46:02 +00:00
John Spurlock
c8b46ca575 Awaken dreams on home + recents. 
Fixes the KEYCODE_HOME case, awakes when home is
started for any reason.

Also awaken when toggling recents (and not locked).

Bug:8557212
Change-Id: I6578ae3971740a03c27596b838d27a5ab9b03752
 2013-04-08 19:18:59 +00:00
ztenghui
4233ec728d HTML5Audio should handle content URI 
Change-Id: Ib7ef4ad5fdd5b6b051ae32b0968a9bddef5c65ba
 2013-04-08 11:42:53 -07:00
Derek Sollenberger
8c7d0f01d5 Merge "Refactoring code to support r8352 of Skia." 2013-04-08 18:01:51 +00:00
ztenghui
8c75967799 am 34dd708a: am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 
* commit '34dd708a21ef49f22877c262e0fec07872624087':
  Update the documentiation for MediaMuxer::writeSampleData()
 2013-04-08 10:31:17 -07:00
ztenghui
34dd708a21 am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 
* commit '50b9eb1c7375a87525d44a036337a8ba18eba55b':
  Update the documentiation for MediaMuxer::writeSampleData()
 2013-04-08 10:27:18 -07:00
ztenghui
50b9eb1c73 Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 2013-04-08 17:22:29 +00:00
Nick Kralevich
98cbcf1b50 AppSecurityPermissions: minor UI changes 
1) Make the box with the permission really go away when a
permission is revoked, not just invisible.
2) Change the order of the buttons, making the negative
button the "revoke" button, and the positive button "ok".

Change-Id: I73694583cbd014d3820f8df6c6b770caae299499
 2013-04-08 10:02:08 -07:00
Daniel Sandler
91fe8455d6 Clean up language in forced foreground service notifications. 
Old:  [ IC ] %s running
      [ ON ] %s is running

New:  [ IC ] %s is running
      [ ON ] Touch for more information or to stop the app.

Additionally, disallow these misbehaving services from
supplying their own content views; if you attempt to run a
foreground service with icon == 0, this is the notification
you will get, period.

Bug: 8525548
Change-Id: I2bfd7340396ef925885e8c2160a720f9eff07a35
 2013-04-08 13:01:02 -04:00
Daniel Sandler
24670fada2 am 11c6b669: am 26c13439: Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero. 
* commit '11c6b669232d48d76a07a5dccb9042f2f5e037b2':
  Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero.
 2013-04-08 08:21:13 -07:00
Daniel Sandler
9717fff785 am fe2902b4: am 0e78de6c: Add tag "foo" to builder test\'s notifications. 
* commit 'fe2902b48b0b3538e8de7b3d64064c244ca5b193':
  Add tag "foo" to builder test's notifications.
 2013-04-08 08:21:10 -07:00
Daniel Sandler
11c6b66923 am 26c13439: Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero. 
* commit '26c134398422a4f4e703cdf7b87fb1cb08d542c4':
  Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero.
 2013-04-08 08:17:10 -07:00
Daniel Sandler
fe2902b48b am 0e78de6c: Add tag "foo" to builder test\'s notifications. 
* commit '0e78de6c0fadd70277eb29f56ccce97c1dffc4f2':
  Add tag "foo" to builder test's notifications.
 2013-04-08 08:17:07 -07:00
Daniel Sandler
26c1343984 Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero. 
Previously they each had to be nonzero, which prevented
using the builder methods to create solid-on LED
notifications.

Change-Id: I30314ec33daa28ee2e1f0b87a184c3540254471c
 2013-04-08 14:44:28 +00:00
Daniel Sandler
0e78de6c0f Add tag "foo" to builder test's notifications. 
This allows them to be conveniently cleared via adb:

  $ adb shell service call notification 5 \
    s16 com.android.statusbartest \
	s16 foo \
	i32 <NOTIFICATIONID> \
	i32 <USERID>

Bug: 8564511
Change-Id: I9fae5a4a0be64d6707cc06ca938adeb8b3c0b735
 2013-04-08 14:42:41 +00:00
Chet Haase
b7045d2fb9 am cbfce445: am edf6f4b4: Make adding views specific to a ViewGroup\'s overlay 
* commit 'cbfce445c500a12fee63e526251471839f44e26b':
  Make adding views specific to a ViewGroup's overlay
 2013-04-08 07:39:17 -07:00
Chet Haase
cbfce445c5 am edf6f4b4: Make adding views specific to a ViewGroup\'s overlay 
* commit 'edf6f4b49f6e77c349f5055372ce381b74f12efb':
  Make adding views specific to a ViewGroup's overlay
 2013-04-08 07:35:07 -07:00
Chet Haase
edf6f4b49f Make adding views specific to a ViewGroup's overlay 
Adding views to views (possible with the new Overlay API) is weird.
This change moves the view-management facilities of Overlay to a subclass
that is specific to the overlay returned from ViewGroup.getOverlay().
So now you can add drawables to all view overlays, but only add/remove
views to/from the overlay returned from ViewGroup.getOverlay().

Also, the previous approach of using an interface for Overlay was
changed to classes for both ViewOverlay and ViewGroupOverlay.

Finally, this change makes not handling touch correctly the proper,
and documented, behavior of overlay views. There are various tricky issues
to sort out with input in overlays (including click handling as well as focus)
and we don't want developers starting to use overlays as some kind of general
container hierarchy, so we're purposely constraining overlays to have visual-only
behavior.

Issue #8459085 Overlay needs to handle touch correctly

Change-Id: I207b8dbf528f87c92369d270d8b0a6556826d207
 2013-04-08 07:30:12 -07:00
Nick Kralevich
1a0a2c8e77 am b21b2c38: am a56b78dc: fix build 
* commit 'b21b2c38e54b655a06aeb2d810438c7bd2413637':
  fix build
 2013-04-07 11:20:56 -07:00
Nick Kralevich
b21b2c38e5 am a56b78dc: fix build 
* commit 'a56b78dcd1292a4291d85113bdeeda8496c1a0c0':
  fix build
 2013-04-07 11:17:25 -07:00
Nick Kralevich
a56b78dcd1 fix build 
Change-Id: I7f3b8a4df84630f40f5a3f19434df86b6287fb75
 2013-04-07 11:13:16 -07:00
Nick Kralevich
e4037e4fa4 am 16843d84: am d7c4186a: Merge "AppSecurityPermissions: add support for revoking permissions" into jb-mr2-dev 
* commit '16843d84889ec4904b3ddef5d2f131efebfc433c':
  AppSecurityPermissions: add support for revoking permissions
 2013-04-07 11:02:32 -07:00
Nick Kralevich
16843d8488 am d7c4186a: Merge "AppSecurityPermissions: add support for revoking permissions" into jb-mr2-dev 
* commit 'd7c4186ae040ed297634b0be11f78592ffc7585f':
  AppSecurityPermissions: add support for revoking permissions
 2013-04-07 10:56:57 -07:00
Nick Kralevich
d7c4186ae0 Merge "AppSecurityPermissions: add support for revoking permissions" into jb-mr2-dev 2013-04-07 17:53:27 +00:00
Kenny Root
99db7379d0 am f1b2c348: am 8b51475c: Revert "Remove AndroidKeyStore from API" 
* commit 'f1b2c34819ff65ba14af5eb4eeba06196ee978d3':
  Revert "Remove AndroidKeyStore from API"
 2013-04-06 10:13:11 -07:00
Kenny Root
f1b2c34819 am 8b51475c: Revert "Remove AndroidKeyStore from API" 
* commit '8b51475c97f8f2742047976283afbe1f9ef9fcbf':
  Revert "Remove AndroidKeyStore from API"
 2013-04-06 10:09:52 -07:00
Kenny Root
8b51475c97 Revert "Remove AndroidKeyStore from API" 
This reverts commit ce24985ad636c38b6ee01ec9cdecfb038bfeaeb6.

Change-Id: I02d6492c8db869619694c7209bb37522a7ec5a29
 2013-04-06 10:05:31 -07:00
Nick Kralevich
ddfbe00b66 AppSecurityPermissions: add support for revoking permissions 
Add UI support for revoking optional permissions. When the user
taps on an optional permission, two new boxes will appear:

  [Cancel] | [Revoke]

Selecting [Revoke] will revoke the permission from the app.

The [Cancel] / [Revoke] options are only shown for apps which support
optional permissions.

Bug: 8332307
Change-Id: I27e374773747737e3a6d7f48ea1448a0178e3393
 2013-04-05 18:42:03 -07:00
Raph Levien
257d78bf76 am a1e6d9ec: am 42967042: Merge "Update Roboto to version 1.200311" into jb-mr2-dev 
* commit 'a1e6d9eca04bf500ef22bc56a7576aee231f133d':
  Update Roboto to version 1.200311
 2013-04-05 17:01:29 -07:00
Raph Levien
a1e6d9eca0 am 42967042: Merge "Update Roboto to version 1.200311" into jb-mr2-dev 
* commit '4296704208a9eeb40f4e5fa8d6d1f79c72c322ee':
  Update Roboto to version 1.200311
 2013-04-05 16:59:20 -07:00
Adam Powell
d7fd69c045 am dddd59ff: am e0e2f4fd: Fix accessibility in action bars and add extra customization 
* commit 'dddd59ff63c3121b53e790bb20b5b5d735036c30':
  Fix accessibility in action bars and add extra customization
 2013-04-05 16:57:56 -07:00