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

88806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
726a7b920e Reconcile with jb-mr1-release - do not merge 
Change-Id: Ib437bf886b664c56e4165f6336e7bcc00c420b3a
 2012-10-05 08:16:43 -07:00
The Android Automerger
b62f227741 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 06:59:36 -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 c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
 2012-10-05 02:32:52 -05: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
Jim Miller
169514fef6 am 74ab4268: am efd7b267: Merge "More userActivity() calls in keyguard" into jb-mr1-dev 
* commit '74ab4268f6881081e325c8acb6f2574dca7cdb66':
  More userActivity() calls in keyguard
 2012-10-04 22:25:20 -07:00
Jim Miller
74ab4268f6 am efd7b267: Merge "More userActivity() calls in keyguard" into jb-mr1-dev 
* commit 'efd7b26797cc64be0d1156f7ba15b5c6b99597e0':
  More userActivity() calls in keyguard
 2012-10-04 22:23:34 -07:00
Jim Miller
efd7b26797 Merge "More userActivity() calls in keyguard" into jb-mr1-dev 2012-10-04 22:21:12 -07:00
Daniel Sandler
8b14fda4f3 am f7eef4e3: am 2a04e740: Merge "Updated clock hands for Quick Settings." into jb-mr1-dev 
* commit 'f7eef4e3bc6a91b102288e0930b8fb1f0198dc48':
  Updated clock hands for Quick Settings.
 2012-10-04 22:15:02 -07:00
Daniel Sandler
f7eef4e3bc am 2a04e740: Merge "Updated clock hands for Quick Settings." into jb-mr1-dev 
* commit '2a04e740973c7a0781263d4a351c249449f556ec':
  Updated clock hands for Quick Settings.
 2012-10-04 22:12:16 -07:00
Daniel Sandler
2a04e74097 Merge "Updated clock hands for Quick Settings." into jb-mr1-dev 2012-10-04 22:09:31 -07:00
Daniel Sandler
96b248affa Updated clock hands for Quick Settings. 
Bug: 7281063
Change-Id: I03e7ca236c8cdc809e112e2e844a0006e73ab504
 2012-10-05 01:07:07 -04:00
Jim Miller
9cf2c523d8 More userActivity() calls in keyguard 
Some security screens aren't currently calling userActivity().  As such,
they allow keyguard to timeout before the user has a chance to enter
the required information.

The fix uses a TextWatcher to look for changes in the input text
and call userActivity() appropriately.

bug 7291431

Change-Id: I6d7889cc01a4d6bdbefefc5af478e812c35b1a49
 2012-10-04 22:02:29 -07:00
Baligh Uddin
b17afccede am 8946d568: am b2908854: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8946d568bcdf13e3da45619a33aac4a4209236f7':
  Import translations. DO NOT MERGE
 2012-10-04 21:58:47 -07:00
Baligh Uddin
8946d568bc am b2908854: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b29088540b2ecb3046277fbeb5ee1c87abe74d95':
  Import translations. DO NOT MERGE
 2012-10-04 21:56:26 -07:00
Baligh Uddin
b29088540b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 21:53:02 -07:00
Baligh Uddin
1b189145ff am 9fc2f894: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '9fc2f894deedeb3178e0ab55cf161897ceca8f5e':
  Import translations. DO NOT MERGE
 2012-10-04 21:53:00 -07:00
Baligh Uddin
9fc2f894de Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 21:51:07 -07:00
Baligh Uddin
587f5b74df am 55442201: am 9565ceb6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '55442201d4d6e854d91a265eb2841100891b6437':
  Import translations. DO NOT MERGE
 2012-10-04 21:47:09 -07:00
Baligh Uddin
963095b2a0 am a51d4ed9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a51d4ed9559bf500e91adbee4101ad5db4e14703':
  Import translations. DO NOT MERGE
 2012-10-04 21:47:09 -07:00
Baligh Uddin
55442201d4 am 9565ceb6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9565ceb6094569a8c7ca719acf5b65ae194548a9':
  Import translations. DO NOT MERGE
 2012-10-04 21:45:45 -07:00
Baligh Uddin
9565ceb609 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 21:43:10 -07:00
Baligh Uddin
a51d4ed955 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 21:41:56 -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
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
Jim Miller
7e74c39980 am 639e18eb: am f0520930: Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev 
* commit '639e18eb4f2bd38110167c7d8ea222df8faf5edd':
  Allow lower case for owner info in keyguard
 2012-10-04 19:44:34 -07:00
Jim Miller
639e18eb4f am f0520930: Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev 
* commit 'f0520930441a228632423c486c2f0db3082ea781':
  Allow lower case for owner info in keyguard
 2012-10-04 19:43:00 -07:00
Christopher Tate
49bbbf2c1c am d87cb794: am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev 
* commit 'd87cb794b063c503f4d732141904bd1edd5c5914':
  Settings (and general) restore fixes
 2012-10-04 19:40:38 -07:00
Jim Miller
f052093044 Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev 2012-10-04 19:40:35 -07:00
Christopher Tate
d87cb794b0 am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev 
* commit '0cd3c976a273a25c2d642064ade997bdf9d99855':
  Settings (and general) restore fixes
 2012-10-04 19:39:07 -07:00
Christopher Tate
0cd3c976a2 Merge "Settings (and general) restore fixes" into jb-mr1-dev 2012-10-04 19:36:41 -07:00
Christopher Tate
5067685ccf Settings (and general) restore fixes 
Pro tem, we ignore wifi configuration data when restoring system settings.
This is not ideal, but it *does* mean we do not bounce wifi off and on
again during the extended restore process, which in turn means we don't
interfere with things like the Play Store's download of applications.
We do continue to back up wifi configuration, and will start using that
data again when the new implementation that restores AP configurations
without having to bounce wifi comes to pass.

Also, this CL fixes a longstanding bug in BackupDataInput.skipEntityData()
that was being reproduced reliably once settings restore was skipping
the wifi-related entities in the restore stream.

Bug 7249405

Change-Id: I61520a9a116b66ebdf95734d09d9afd46406df01
 2012-10-04 19:10:11 -07:00
Jim Miller
9fdabab7e9 Allow lower case for owner info in keyguard 
bug 7094419

Change-Id: Ic89d51f1d490b99a9cdd897b71057be37004301a
 2012-10-04 18:47:18 -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
Dianne Hackborn
82e9bd113a am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 
* commit 'a9e9eb7026331d4f0ba2fcebeca184df0463b9f2':
  Fix issue #7290206: Need API to get/look up user serial number
 2012-10-04 18:21:47 -07:00