Daniel Sandler
a4b48330de
am d7620196: Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev
...
* commit 'd7620196e512e71b552bda8df48125b73d1c95d8':
Restore rubberbanding on initial pulldown.
2012-10-05 09:58:46 -07:00
Daniel Sandler
d7620196e5
Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev
2012-10-05 09:56:20 -07:00
Daniel Sandler
a801f68624
Restore rubberbanding on initial pulldown.
...
Broken by change Id93d6a00.
Bug: 7286201
Change-Id: I4155076df09d548aa00ae3793f78e6c154cde5f1
2012-10-05 11:01:05 -04: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
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
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
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
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
9fc2f894de
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-04 21:51:07 -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
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
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
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
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
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
a9e9eb7026
am 0cdbd077: Merge "Fix issue #7290206 : Need API to get/look up user serial number" into jb-mr1-dev
...
* commit '0cdbd0776d141011567e63158aa0a430362425ef':
Fix issue #7290206 : Need API to get/look up user serial number
2012-10-04 18:20:41 -07:00
Dianne Hackborn
0cdbd0776d
Merge "Fix issue #7290206 : Need API to get/look up user serial number" into jb-mr1-dev
2012-10-04 18:19:01 -07:00
Raph Levien
32d932c72d
am 19348623: Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev
...
* commit '19348623fa006a87e668a1c69c412b0ff5da88c9':
Updated Roboto fonts with correct T comma accent encoding
2012-10-04 18:19:00 -07:00
Raph Levien
19348623fa
Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev
2012-10-04 18:15:55 -07:00
Amith Yamasani
21f0777c11
am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev
...
* commit 'c192c649ba3b79dff70c5ccf981d631b929b5778':
Fix serial number assignment for new user on a freshly wiped device
2012-10-04 18:05:34 -07:00
Amith Yamasani
c192c649ba
Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev
2012-10-04 18:03:47 -07:00
Adam Cohen
a39c5c369a
am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev
...
* commit '327424d69b99213e872e91f05feba2d0a137d6c7':
Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
2012-10-04 18:03:36 -07:00
Satoshi Kataoka
0f300c7045
am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev
...
* commit '284b20538764afe2500be6ba5b1f3a057123ffc9':
Support multi-user switch in TextServicesManagerService
2012-10-04 18:03:33 -07:00
Jeff Brown
5430835934
Ensure we send at least one wakeup/gotosleep transition.
...
This fixes an issue where the device would not lock immediately
when the user quickly pressed power off / power on even if
configured to do so. We were suppressing the screen off
and wake up broadcast in this case.
Now we make sure to always send at least one broadcast to
indicate the transition. We still collapse back-to-back
full cycle transitions though so as not to end up enqueuing
useless broadcasts.
Bug: 7061116
Change-Id: I7211c5fd963c271c2b0aceb4d2f746063c629079
2012-10-04 18:03:11 -07:00
Adam Powell
123436ebd5
am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev
...
* commit '2ee1f6567d2bc25c58f212354ffd09df18fc0b25':
MediaRouter/Wireless Display - correct initial state
2012-10-04 18:01:52 -07:00
Christian Robertson
439b85ef9d
Updated Roboto fonts with correct T comma accent encoding
...
Updated Roboto fonts fixing issue where Tcommaaccent and Tcedilla
characters were encoded improperly (their values were switched). This
patch addresses bug 7198855 and bug 7070912. Original was mistakenly
submitted to master but should be applied to jb-mr1-dev instead.
Also, this commit reverts the addition of RobotoCondensed-Light and its
italic, for which we don't have any build file or XML metadata support.
Change-Id: If1c592474f1f7199e98bb98edf4de6466b43fa51
2012-10-04 18:01:14 -07:00
Adam Cohen
327424d69b
Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev
2012-10-04 18:01:09 -07:00
Satoshi Kataoka
284b205387
Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev
2012-10-04 18:01:09 -07:00
Adam Powell
2ee1f6567d
Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev
2012-10-04 18:00:01 -07:00