93363 Commits

Author SHA1 Message Date
Irfan Sheriff
c4cbb35fc2 am 88d254cf: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '88d254cffbf8d1b75d506384a41148a3112b6af1':
  Handle group tear down only at group removed event
2012-10-24 15:28:22 -07:00
Dianne Hackborn
b26306ad52 Fix issue #7408647: Add getUserCount() API
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
2012-10-24 15:28:03 -07:00
Irfan Sheriff
88d254cffb 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:28 -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
Brett Chabot
70f0ef46db Merge "Remove erroneous override of package-private method." 2012-10-24 15:11:46 -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
5e3f246189 am bf3c2898: am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit 'bf3c28982c3b487f516b1b118944818426fc5fed':
  Dim the screen quickly in response to user activity timeout.
2012-10-24 15:02:58 -07:00
Jeff Brown
bf3c28982c am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit 'b21b4fdcea2d3ff4186f4c8dbcd89493cc4fd2bf':
  Dim the screen quickly in response to user activity timeout.
2012-10-24 15:00:31 -07:00
Jeff Brown
b21b4fdcea 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:26 -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
Brett Chabot
41e173d4cb Remove erroneous override of package-private method.
Change-Id: I8d473c1eb32f2513d01b3f7f14f0001286a6a9ca
2012-10-24 14:51:21 -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
Romain Guy
144b59adb1 am f323fd07: am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
* commit 'f323fd07ba75b8bc13470a22f698937345bc9f0d':
  Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:58:49 -07:00
Romain Guy
f323fd07ba am 4344f209: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev
* commit '4344f20959b6591f484d20012a398d7fefe8a8fb':
  Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:56:27 -07:00
Baligh Uddin
5800ee3ba6 Merge "Import translations. DO NOT MERGE" 2012-10-24 13:56:26 -07:00
Baligh Uddin
b1142ef3f0 am e3e62668: (-s ours) am 229a22ef: am 188bf0e6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'e3e626683f0e932b6c759003c9db4a35f901abf1':
  Import translations. DO NOT MERGE
2012-10-24 13:55:42 -07:00
Romain Guy
4344f20959 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:46 -07:00
Baligh Uddin
e3e626683f am 229a22ef: am 188bf0e6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '229a22efc595f7676dfe4699c3bfcf5ce8414ac2':
  Import translations. DO NOT MERGE
2012-10-24 13:52:22 -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
229a22efc5 am 188bf0e6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '188bf0e63c30fa557dc897faf1b55da045b23ca0':
  Import translations. DO NOT MERGE
2012-10-24 13:50:23 -07:00
Baligh Uddin
0039a7e2cf am 51594bf2: (-s ours) am 3dc0cb6e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '51594bf217c86e19c8d93109c49e656f9675fc40':
  Import translations. DO NOT MERGE
2012-10-24 13:48:44 -07:00
Baligh Uddin
188bf0e63c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-24 13:47:21 -07:00
Baligh Uddin
51594bf217 am 3dc0cb6e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '3dc0cb6e431b7ebe4a4dbf17c484793693a5e0d6':
  Import translations. DO NOT MERGE
2012-10-24 13:46:31 -07:00
Baligh Uddin
3dc0cb6e43 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-24 13:43:41 -07:00
Amith Yamasani
2f389eaff1 am 2104cdb0: am 9bf572c2: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
* commit '2104cdb0e6bed1616b3a67f4b7eb3d1d6feae07b':
  Fix a crash in InputMethodManagerService due to permission failure.
2012-10-24 13:39:01 -07:00
Amith Yamasani
2104cdb0e6 am 9bf572c2: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
* commit '9bf572c2d3998977d4aef456e1c55c5d682b0bef':
  Fix a crash in InputMethodManagerService due to permission failure.
2012-10-24 13:36:13 -07:00
Amith Yamasani
9bf572c2d3 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:37 -07:00
Victoria Lease
5cc4126de1 am e939044d: am 1417167f: am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
* commit 'e939044da0e817499181a002dbc9b27bbd0cf9aa':
  revise android.location.Geofence documentation
2012-10-24 13:32:16 -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
Victoria Lease
e939044da0 am 1417167f: am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
* commit '1417167f1b608adee609553efaa89d7ab9a91a4a':
  revise android.location.Geofence documentation
2012-10-24 13:29:25 -07:00
Victoria Lease
1417167f1b am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
* commit 'f704e9f67745d1f1c01058f4c74b06d157b4054d':
  revise android.location.Geofence documentation
2012-10-24 13:26:41 -07:00
Victoria Lease
f704e9f677 Merge "revise android.location.Geofence documentation" into jb-mr1-dev 2012-10-24 13:23:21 -07:00
Baligh Uddin
e17ac56d4a Merge "Import translations. DO NOT MERGE" 2012-10-24 12:59:18 -07:00
Baligh Uddin
e0505c83e4 Import translations. DO NOT MERGE
Change-Id: Ic50c355af152a41837e7df32490cbb4fd3486ef1
Auto-generated-cl: translation import
2012-10-24 12:48:59 -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
Baligh Uddin
c5a1f8cd78 Import translations. DO NOT MERGE
Change-Id: I153e44f39a1bc197f1e0acca274239aee0404809
Auto-generated-cl: translation import
2012-10-24 12:44:10 -07:00
Mike Lockwood
fdf85b6b88 Merge "More changes to fix PDK build:" 2012-10-24 12:34:21 -07:00
Christopher Tate
cd0e1c91a8 am d5d2161c: am 6eb0d777: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
* commit 'd5d2161c91f4eb20087f66386a42989123354a59':
  Fix the Backup Manager's uninstall tracking
2012-10-24 12:32:28 -07:00
Mike Lockwood
c59b2f9a77 More changes to fix PDK build:
move screencap back to frameworks/base
move libdiskusage to frameworks/native

Change-Id: I8abe425c4bbf305bbe8650094c40c16df8c6d5e4
2012-10-24 12:31:10 -07:00
Christopher Tate
d5d2161c91 am 6eb0d777: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
* commit '6eb0d7770160f9adc0f5d20bbb292352494b5049':
  Fix the Backup Manager's uninstall tracking
2012-10-24 12:29:27 -07:00
Christopher Tate
6eb0d77701 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:46 -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
Baligh Uddin
3bba591420 Import translations. DO NOT MERGE
Change-Id: Ia5b4b48eccf2ffdf0c06969e24f8d85b51f12d27
Auto-generated-cl: translation import
2012-10-24 12:24:09 -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
503fd7591e am 25250c21: (-s ours) am c832ca32: am 0fa4cf5b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '25250c21a3614397354d7480bd884f0dbc80efcd':
  Import translations. DO NOT MERGE
2012-10-24 12:22:05 -07:00
Jeff Brown
2af7e72229 am 5bac2df4: am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
* commit '5bac2df4d69f096fa8c858bcb3713b7af9e977f8':
  Secure windows, secure surface views and secure displays.
2012-10-24 12:22:01 -07:00
Baligh Uddin
25250c21a3 am c832ca32: am 0fa4cf5b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c832ca325f309d10d0bceea958439c1517cf70d3':
  Import translations. DO NOT MERGE
2012-10-24 12:20:02 -07:00
Jeff Brown
5bac2df4d6 am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
* commit 'b43269acddb7061c43fa6ace6a896c51a9bf4dce':
  Secure windows, secure surface views and secure displays.
2012-10-24 12:19:59 -07:00
Baligh Uddin
c832ca325f am 0fa4cf5b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '0fa4cf5bb57d1c116db6b07256afa224619c461f':
  Import translations. DO NOT MERGE
2012-10-24 12:17:24 -07:00
Jeff Brown
b43269acdd 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:16 -07:00