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

93514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Mawhinney
83d960bffa am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev 
* commit '33c0a616dbd284b47cc8e6af2eec358fba7c701f':
  Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
 2012-10-25 02:09:43 -07:00
Bryan Mawhinney
33c0a616db Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev 2012-10-25 02:06:37 -07:00
Dianne Hackborn
7a588e757a am a699c1b1: am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'a699c1b16f9732308a5c17260607db1b7690d394':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:07:17 -07:00
Daniel Sandler
cf72fd5cc5 am 829e0015: am 0c707b2b: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev 
* commit '829e001546a96a63b7a742b3dfa1bfa6c592029e':
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
 2012-10-24 18:04:34 -07:00
Dianne Hackborn
a699c1b16f am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit '72d0a5aa04f18af5037ff331c2f0983f7cbd4331':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:04:27 -07:00
Dianne Hackborn
72d0a5aa04 am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'ead7d90e8b049c9689560015dbb761242fd86c99':
  Fix issue #7408647: Add getUserCount() API
 2012-10-24 18:02:05 -07:00
Daniel Sandler
829e001546 am 0c707b2b: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev 
* commit '0c707b2b7e871f2c3c248678bcfa162434dd8bec':
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
 2012-10-24 18:01:32 -07:00
Daniel Sandler
0c707b2b7e am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev 
* commit '38c904a6bc3cc215940ec0d8f96cda9376ff0133':
  Be a little more lenient with panel-open gestures.
  Missing copyright headers.
 2012-10-24 17:59:12 -07:00
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
Nick Kralevich
52cfb0ccc7 am 369852eb: am 7e007ff8: Merge "Sensors could be disabled by any application" 
* commit '369852ebdea6a5843e299000c57baac89282b154':
  Sensors could be disabled by any application
 2012-10-24 16:52:21 -07:00
Nick Kralevich
369852ebde am 7e007ff8: Merge "Sensors could be disabled by any application" 
* commit '7e007ff83738a83f43cb59ddc023a2b860367074':
  Sensors could be disabled by any application
 2012-10-24 16:50:32 -07:00
Nick Kralevich
7e007ff837 Merge "Sensors could be disabled by any application" 2012-10-24 16:29:06 -07:00
Bo Liu
7cd2baf4ce Remove CacheManager implementation 
CacheManager will not be implemented with webviewchromium. So removing
existing implemntation in WebViewClassic.

Change-Id: I82d3a156ba898393cc12080f8150841cd76f187a
 2012-10-24 16:00:01 -07:00
Irfan Sheriff
c3df33796e am c4cbb35f: am 88d254cf: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev 
* commit 'c4cbb35fc22e0aee6a1386d024567274151f0c01':
  Handle group tear down only at group removed event
 2012-10-24 15:30:15 -07:00
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