Dianne Hackborn
ead7d90e8b
Merge "Fix issue #7408647 : Add getUserCount() API" into jb-mr1-dev
2012-10-24 17:58:13 -07:00
Daniel Sandler
38c904a6bc
Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
...
* changes:
Be a little more lenient with panel-open gestures.
Missing copyright headers.
2012-10-24 17:55:10 -07:00
Michael Jurka
aa2859ae61
Adding ability to add multiple widgets to keyguard
...
Bug: 7381803
2012-10-24 17:41:34 -07:00
Adam Powell
eee209313d
Beginnings of bouncer support; add scrims and state tracking
...
Integrating from prototype app
Change-Id: Ib142cf371c5997f547266d8af7e25129fb4e1343
2012-10-24 16:33:44 -07:00
Dianne Hackborn
b26306ad52
Fix issue #7408647 : Add getUserCount() API
...
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
2012-10-24 15:28:03 -07:00
Irfan Sheriff
9253f56163
am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
...
* commit '4e7f2ffe1791807636ac542f73016773c30daa92':
Handle group tear down only at group removed event
2012-10-24 15:26:41 -07:00
Irfan Sheriff
4e7f2ffe17
Merge "Handle group tear down only at group removed event" into jb-mr1-dev
2012-10-24 15:23:47 -07:00
Irfan Sheriff
2bc0c5fef2
Handle group tear down only at group removed event
...
Handling group removal at disconnect causes issues where supplicant keeps
the group and then the next invocation fails
Bug: 7403755
Change-Id: Iea7e5ec98486607f8e2c4a55be3743e0545a9da7
2012-10-24 15:05:56 -07:00
Jeff Brown
2ca85c2051
am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
...
* commit '900e0ba5163bd03becf49922dfdfad07460716f0':
Dim the screen quickly in response to user activity timeout.
2012-10-24 14:58:28 -07:00
Jeff Brown
900e0ba516
Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
2012-10-24 14:55:41 -07:00
Jeff Brown
5244c93176
Dim the screen quickly in response to user activity timeout.
...
Reverts a previous change that made the screen dim slowly instead.
The quick transition does a better job of attracting the user's
attention to the fact that the screen is about to turn off
unless the user touches the screen.
Bug: 7386034
Change-Id: I81e4d8939f6791b96352004984a9e5b2aab79788
2012-10-24 14:46:26 -07:00
Adam Powell
c0657fb36c
Integrate changes from lockscreen proto app
...
Fix padding/layout issues in MultiPaneChallengeLayout
Change-Id: I610b4c0cc321a690fa29d071d6a960c05ffbe3a7
2012-10-24 14:01:37 -07:00
Romain Guy
ee0f615ffd
am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:53:43 -07:00
Baligh Uddin
f785af4d2e
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-24 13:51:29 -07:00
Romain Guy
9933331506
Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
2012-10-24 13:50:45 -07:00
Baligh Uddin
a187b478b6
am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '188bf0e63c30fa557dc897faf1b55da045b23ca0':
Import translations. DO NOT MERGE
2012-10-24 13:50:22 -07:00
Baligh Uddin
188bf0e63c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-24 13:47:21 -07:00
Amith Yamasani
599885d530
am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
...
* commit 'cd668554417f089aa0ae013a29ab81864b4b4685':
Fix a crash in InputMethodManagerService due to permission failure.
2012-10-24 13:33:38 -07:00
Amith Yamasani
cd66855441
Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
2012-10-24 13:30:01 -07:00
Chris Wren
f0cec427a4
Merge "remove debug logs." into jb-mr1-lockscreen-dev
2012-10-24 13:27:40 -07:00
Victoria Lease
405e6746c6
am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
...
* commit 'f704e9f67745d1f1c01058f4c74b06d157b4054d':
revise android.location.Geofence documentation
2012-10-24 13:26:38 -07:00
Chris Wren
dc0d12278a
remove debug logs.
...
Change-Id: I8d0066bdce1c93c7a3da0fa36d865c674e5dcd40
Proto-Id: I7ac6b8c8a664dbd7abda089fcd9edb8d7ccc3208
2012-10-24 16:26:34 -04:00
Victoria Lease
f704e9f677
Merge "revise android.location.Geofence documentation" into jb-mr1-dev
2012-10-24 13:23:21 -07:00
Adam Cohen
a9f166695b
Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev
2012-10-24 13:18:39 -07:00
Adam Cohen
6fb841fa21
Fading side pages as per mock
...
-> Also, adding side pages hints when keyguard is inflated
Change-Id: I33f073ed97510a5982cddc4ee95f1ee3ed3c9397
2012-10-24 13:15:38 -07:00
Chris Wren
ff8722574e
Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev
2012-10-24 13:07:29 -07:00
Chris Wren
28c5ee9ea9
catch exceptional cases on factory-fresh devices.
...
Change-Id: I2019b4f31415efba72b5a3b5d659e41595e506f6
Proto-Id: I8a57f9f6f5b7339df3e243ecc51fb311f6ac8981
2012-10-24 16:05:14 -04:00
Baligh Uddin
ceafeb4a8e
Import translations. DO NOT MERGE
...
Change-Id: I2b01c3cba17b2317a2787e1b6d2d5b3f45bde2f7
Auto-generated-cl: translation import
2012-10-24 12:47:03 -07:00
Baligh Uddin
de18c8bf21
Import translations. DO NOT MERGE
...
Change-Id: I3717e675767f545d33b89efc85909a2d172808b8
Auto-generated-cl: translation import
2012-10-24 12:45:34 -07:00
Christopher Tate
698e144f70
am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
...
* commit 'acf5943c44d34845386afe7946aed086f8b3e87e':
Fix the Backup Manager's uninstall tracking
2012-10-24 12:27:47 -07:00
Christopher Tate
acf5943c44
Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-dev
2012-10-24 12:24:51 -07:00
Daniel Sandler
be2cf3206e
Be a little more lenient with panel-open gestures.
...
The code would not consider any drag that did not complete
the "peek" distance (the distance the panel opens when you
press and hold on the status bar; on tablets this is
statusbarheight + closehandleheight, and on phones it's
headerheight + closehandleheight) as a candidate for a
fling, and set that drag's effective velocity to 0.
This CL just removes that check. Now a fling must meet the
minimum linear velocity and minimum Y distance thresholds
(100dp/sec and 20dp, respectively) to change the position of
the panel (closed->open or open->closed).
Bug: 7390976
Change-Id: Ia0c2450f9fdf3f27b890aab240a155dad1ab052f
2012-10-24 15:23:42 -04:00
Baligh Uddin
985dc14264
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-24 12:19:01 -07:00
Baligh Uddin
2171fa1cd3
am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0fa4cf5bb57d1c116db6b07256afa224619c461f':
Import translations. DO NOT MERGE
2012-10-24 12:17:09 -07:00
Jeff Brown
d9fb5848c8
am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
Secure windows, secure surface views and secure displays.
2012-10-24 12:17:04 -07:00
Baligh Uddin
0fa4cf5bb5
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-24 12:15:05 -07:00
Jeff Brown
1202c43685
Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
2012-10-24 12:14:08 -07:00
Baligh Uddin
c1e2466502
Import translations. DO NOT MERGE
...
Change-Id: I035193bae4235a54f721473ff5db4f63e1b1b4ae
Auto-generated-cl: translation import
2012-10-24 12:10:45 -07:00
Baligh Uddin
c1b2060b17
Import translations. DO NOT MERGE
...
Change-Id: I60e51769668cbf4823155238a51cdac84b4b49af
Auto-generated-cl: translation import
2012-10-24 12:08:18 -07:00
Daniel Sandler
50a531337e
Missing copyright headers.
...
Change-Id: I0fac062ffa52fc21f32d25d3f0a38e263e701c46
2012-10-24 15:02:27 -04:00
Zhihai Xu
11181c7ae6
am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit '8e080d7e10dd17662750605538a9799af66494e9':
License of files Bluetooth package is not updated to ASL2
2012-10-24 11:01:15 -07:00
Dirk Dougherty
7833ea17ad
am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
...
* commit 'd8d83faae8101cda0c4f6fa2616d6b4c596e7d75':
Doc change: update develop landing page content.
2012-10-24 11:01:10 -07:00
Dianne Hackborn
cc9106bb7a
am ecf4725e: Merge "Fix issue #7401818 : Wrong transition animation when clearing task" into jb-mr1-dev
...
* commit 'ecf4725ef4e753a2ef08205c922391753eb3803f':
Fix issue #7401818 : Wrong transition animation when clearing task
2012-10-24 11:01:07 -07:00
Dave Burke
4d56a16728
am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
...
* commit '799916e6ac706921e43a3382e5d9e06e13f87525':
Revert "Check non-primary user dirs during package scan"
2012-10-24 11:00:31 -07:00
Eric Laurent
22df26cac2
am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev
...
* commit 'f52cbb6b1800fc2b338e8c0883170567fcd0447a':
AudioService: add fix for corrupted settings
2012-10-24 11:00:11 -07:00
Kenny Root
16106a7641
am 92bc9b31: PMS: check outInfo for null during delete
...
* commit '92bc9b3196907a76d4b73c3f361d41c14dfd7f5c':
PMS: check outInfo for null during delete
2012-10-24 11:00:01 -07:00
Dianne Hackborn
a4dcf311c1
am 56e75631: Merge "Fix issue #7342364 : JellyBean broke Toddler Lock, again" into jb-mr1-dev
...
* commit '56e75631bd737e5362309330d4839cc1dddb501c':
Fix issue #7342364 : JellyBean broke Toddler Lock, again
2012-10-24 10:59:40 -07:00
Svetoslav Ganov
40ca868a08
am e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev
...
* commit 'e1655c980d28b953597727d2c7832b442ca926cc':
When A11y is on, use a longer interval between lockout announcements.
2012-10-24 10:59:36 -07:00
Zhihai Xu
8e080d7e10
Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
2012-10-24 10:44:16 -07:00
Dirk Dougherty
d8d83faae8
am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
...
* commit 'cde979d2fdc9cf7517819b896ca46a7d7768ff43':
Doc change: update develop landing page content.
2012-10-24 10:43:44 -07:00