Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,849 Commits 3 Branches 0 Tags
f3ca25eff61798628ee682f2e793058c9d824721
Commit Graph

9302 Commits

Author SHA1 Message Date
Jeff Brown
f3ca25eff6 am 3aa7fd14: am acc69908: am 0728206a: Merge "Ensure that dreams show while docked." into jb-mr1-dev 
* commit '3aa7fd1434d141cf1671b52b8b7b5ed5e057079b':
  Ensure that dreams show while docked.
 2012-10-05 16:08:31 -07:00
Jeff Brown
3aa7fd1434 am acc69908: am 0728206a: Merge "Ensure that dreams show while docked." into jb-mr1-dev 
* commit 'acc6990833f3699f17639f4972aa4d3fb713ef3e':
  Ensure that dreams show while docked.
 2012-10-05 16:06:49 -07:00
Jeff Brown
acc6990833 am 0728206a: Merge "Ensure that dreams show while docked." into jb-mr1-dev 
* commit '0728206a1138698faa171271a81fbe8dd0ddcf73':
  Ensure that dreams show while docked.
 2012-10-05 16:04:20 -07:00
Jeff Brown
0728206a11 Merge "Ensure that dreams show while docked." into jb-mr1-dev 2012-10-05 16:01:52 -07:00
Jeff Sharkey
f5f58f299a am 3034d313: am 57a03722: am aa99257d: Merge "Only play notification sounds for active user." into jb-mr1-dev 
* commit '3034d3139e2a82465e58d50481265e013d7da176':
  Only play notification sounds for active user.
 2012-10-05 15:43:13 -07:00
Jeff Sharkey
3034d3139e am 57a03722: am aa99257d: Merge "Only play notification sounds for active user." into jb-mr1-dev 
* commit '57a0372221396279d4721a0ef33393d29e4de1cc':
  Only play notification sounds for active user.
 2012-10-05 15:40:09 -07:00
Jeff Sharkey
57a0372221 am aa99257d: Merge "Only play notification sounds for active user." into jb-mr1-dev 
* commit 'aa99257dec300c1db99ee0f0d1193e0b301dde39':
  Only play notification sounds for active user.
 2012-10-05 15:38:20 -07:00
Jeff Sharkey
aa99257dec Merge "Only play notification sounds for active user." into jb-mr1-dev 2012-10-05 15:35:14 -07:00
Jeff Sharkey
8637bd9766 Only play notification sounds for active user. 
Bug: 7298302
Change-Id: I1e176f7b17bb51b878f2e8b345804780df92d487
 2012-10-05 15:29:01 -07:00
Jeff Brown
9fca9e9698 Ensure that dreams show while docked. 
Fixed a race between the UiModeManagerService and PowerManagerService
both of which are trying to wake the device when docked / powered.

Bug: 7281240
Change-Id: Ia41fef48f17f2a2eb56549437d295f9a86c95af2
 2012-10-05 15:21:06 -07:00
Jeff Brown
ed249218b1 am 4bb6d07a: am 513b8ea1: am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr1-dev 
* commit '4bb6d07a8b93e37b20299374141118c07e7bc80c':
  Coordinate screen on with the window manager.
 2012-10-05 15:02:25 -07:00
Jeff Brown
4bb6d07a8b am 513b8ea1: am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr1-dev 
* commit '513b8ea16fdedd7b6debd718798c0220edd61d7f':
  Coordinate screen on with the window manager.
 2012-10-05 15:00:47 -07:00
Jeff Brown
513b8ea16f am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr1-dev 
* commit '3f1246a29b58cf78ebe674ec0905ad1795027aac':
  Coordinate screen on with the window manager.
 2012-10-05 14:58:01 -07:00
Jeff Brown
3f1246a29b Merge "Coordinate screen on with the window manager." into jb-mr1-dev 2012-10-05 14:55:26 -07:00
Jeff Brown
c38c9be031 Coordinate screen on with the window manager. 
Bug: 7267457
Change-Id: Ic2c322253639e1f0b2e4e72a7b145025d0240f93
 2012-10-05 14:39:23 -07:00
Dianne Hackborn
70ad7cc555 am 8855d469: am ebdc064d: am 7ef38ea9: Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev 
* commit '8855d469c22b0dc66b06937142083e31ddd06fd7':
  Fix issue #7275122: Wall paper jank when switching users
 2012-10-05 13:02:58 -07:00
Dianne Hackborn
8855d469c2 am ebdc064d: am 7ef38ea9: Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev 
* commit 'ebdc064ddb3accf28be8dd6661cfbc7ec5e3cc22':
  Fix issue #7275122: Wall paper jank when switching users
 2012-10-05 13:00:31 -07:00
Dianne Hackborn
ebdc064ddb am 7ef38ea9: Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev 
* commit '7ef38ea9e5ee1d2fd58e818f37191a589793e236':
  Fix issue #7275122: Wall paper jank when switching users
 2012-10-05 12:57:43 -07:00
Dianne Hackborn
7ef38ea9e5 Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev 2012-10-05 12:54:52 -07:00
Dianne Hackborn
bce0cbb40d Fix issue #7275122: Wall paper jank when switching users 
Change-Id: I2677c7641a01b4afe89db29cb5fc1af876f9d078
 2012-10-05 11:06:53 -07:00
Jeff Hamilton
2dd1816661 am 69813a0d: am 7fe70683: am 20de160c: Revert "Changes to support updating location providers." 
* commit '69813a0db10d7c64ed93a2871028a79052c9950f':
  Revert "Changes to support updating location providers."
 2012-10-05 00:55:52 -07:00
Jeff Hamilton
69813a0db1 am 7fe70683: am 20de160c: Revert "Changes to support updating location providers." 
* commit '7fe7068362e4e383390c039488dab65caa51df3b':
  Revert "Changes to support updating location providers."
 2012-10-05 00:52:44 -07:00
Jeff Hamilton
7fe7068362 am 20de160c: Revert "Changes to support updating location providers." 
* commit '20de160ca32a8f2936a80ffd70551a22e2371d25':
  Revert "Changes to support updating location providers."
 2012-10-05 00:48:48 -07:00
Jeff Hamilton
20de160ca3 Revert "Changes to support updating location providers." 
This reverts commit c19efc204a.
 2012-10-05 02:32:52 -05:00
Matthew Xie
b0207b39ad am 0c578546: am 91d1d156: am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit '0c5785465c7937fb748553d85724afb4bfc6473a':
  Add multi user support for bluetooth
 2012-10-04 23:29:57 -07:00
Matthew Xie
0c5785465c am 91d1d156: am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit '91d1d15624d831eb822ac97dde1916762e136015':
  Add multi user support for bluetooth
 2012-10-04 23:27:17 -07:00
Matthew Xie
91d1d15624 am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit 'd21b483904057212ab1654b8ef606d41f2d3fe46':
  Add multi user support for bluetooth
 2012-10-04 23:24:27 -07:00
Matthew Xie
d21b483904 Merge "Add multi user support for bluetooth" into jb-mr1-dev 2012-10-04 23:21:34 -07:00
Daniel Sandler
ac377c849a am 3e78586d: am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit '3e78586db6ee28d5052fe9934104dec4c2e87f8b':
  DreamService API revisions.
 2012-10-04 21:03:20 -07:00
Daniel Sandler
3e78586db6 am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit '689a55d813a846d7b64f2bf1b6c86d9f9b5bdbea':
  DreamService API revisions.
 2012-10-04 21:01:13 -07:00
Daniel Sandler
689a55d813 am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit 'f5e2b2c26c37d839e6559319d311b62598c6dade':
  DreamService API revisions.
 2012-10-04 20:58:27 -07:00
Daniel Sandler
f5e2b2c26c Merge "DreamService API revisions." into jb-mr1-dev 2012-10-04 20:56:08 -07:00
Daniel Sandler
2d78490292 DreamService API revisions. 
Reduce reliance on Service interface overrides, instead
steering clients to the DreamService-specific lifecycle
hooks:

  onAttachedToWindow .. onDreamingStarted ..
  onDreamingStopped .. onDetachedFromWindow

The old Dream.java is finally gone now too.

Bug: 7281802
Change-Id: Ib7802c3397fde60ad1132fa49831da182eef4d7a
 2012-10-04 23:38:15 -04:00
Jeff Brown
8d4aa2d32d am 6513d7d4: am 11337984: am a07b1fff: Merge "Support animating just the backlight when turning off." into jb-mr1-dev 
* commit '6513d7d446173184d3f2a143a9f9bd641a23dcec':
  Support animating just the backlight when turning off.
 2012-10-04 20:34:45 -07:00
Jeff Brown
6716c15c6a am 7709f5d8: am 901d8666: am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 
* commit '7709f5d87078da7640dd0c6a58187e25932656ef':
  Ensure we send at least one wakeup/gotosleep transition.
 2012-10-04 20:34:41 -07:00
Jeff Hamilton
a3d37a6c4a am 35512ab0: am f2e292f5: am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit '35512ab00697ce50f9ff5a39f3f3a4ccb7e3b7f0':
  Changes to support updating location providers.
 2012-10-04 20:34:13 -07:00
Jeff Brown
6513d7d446 am 11337984: am a07b1fff: Merge "Support animating just the backlight when turning off." into jb-mr1-dev 
* commit '113379842f659e5efa732ae99807b2c10383b304':
  Support animating just the backlight when turning off.
 2012-10-04 20:24:18 -07:00
Jeff Brown
7709f5d870 am 901d8666: am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 
* commit '901d8666f9421090cd33d3f2add66d39f93bf771':
  Ensure we send at least one wakeup/gotosleep transition.
 2012-10-04 20:24:14 -07:00
Jeff Brown
113379842f am a07b1fff: Merge "Support animating just the backlight when turning off." into jb-mr1-dev 
* commit 'a07b1fffbe7c43485b35ba83c9083a59ff328df1':
  Support animating just the backlight when turning off.
 2012-10-04 20:21:37 -07:00
Jeff Brown
901d8666f9 am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 
* commit '29126cf0f7992805b274510420485c95e3741598':
  Ensure we send at least one wakeup/gotosleep transition.
 2012-10-04 20:21:34 -07:00
Jeff Brown
a07b1fffbe Merge "Support animating just the backlight when turning off." into jb-mr1-dev 2012-10-04 20:20:25 -07:00
Jeff Brown
29126cf0f7 Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 2012-10-04 20:19:31 -07:00
Jeff Brown
a52772ff26 Support animating just the backlight when turning off. 
Bug: 7224614
Change-Id: Ic9fa7a9e458c89d347b03bce6829f952bdf3b6a5
 2012-10-04 18:39:24 -07:00
Matthew Xie
fca9d63635 Add multi user support for bluetooth 
Create a BLUETOOTH_STACK permission to share between all users of
Bluetooth apk. Bluetooth Manager binds to apk of current user
bug 6925422

Change-Id: I2df5546e977c2d77bc66d97d12479d933826922a
 2012-10-04 18:35:42 -07:00
Jeff Hamilton
35512ab006 am f2e292f5: am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit 'f2e292f5548fe791e5b5c882e5e2088e7417e8dc':
  Changes to support updating location providers.
 2012-10-04 18:29:51 -07:00
Jeff Hamilton
f2e292f554 am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit '82b946496e2a503b5b21af318af5be828a223a44':
  Changes to support updating location providers.
 2012-10-04 18:28:02 -07:00
Jeff Hamilton
82b946496e Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-04 18:23:45 -07:00
Amith Yamasani
dd185ea0df am a32c4ec5: am 21f0777c: am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 
* commit 'a32c4ec5f385256d9d31ae311f8870d5d1d8549f':
  Fix serial number assignment for new user on a freshly wiped device
 2012-10-04 18:10:27 -07:00
Adam Cohen
c5bbd1c6a5 am 451d49b3: am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit '451d49b34c8399a3479ca96addcc11857b6afb3e':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:08:36 -07:00
Satoshi Kataoka
6cb4be0aa6 am 42802338: am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '4280233813c22663d3e9d100cac70eaccd0d2afc':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:08:32 -07:00