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

31571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shimeng (Simon) Wang
bcfd23a56d Merge "Use max of content width and initial preferred width as the viewport." 2010-09-21 09:29:32 -07:00
Marc Blank
141e00c212 Fix broken build due to rename of Geocoder.isImplemented 
Change-Id: I350d560bc99661550f939f70b6abcb40bbe44bfc
 2010-09-20 20:35:09 -07:00
Irfan Sheriff
f2c4edba06 am d23329df: (-s ours) am df59f257: Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 
Merge commit 'd23329df879993c71d9ba2d1e695f2dca8ef571c'

* commit 'd23329df879993c71d9ba2d1e695f2dca8ef571c':
  DO NOT MERGE Enable debug in StatusBarService
 2010-09-20 20:07:34 -07:00
Irfan Sheriff
d23329df87 am df59f257: Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 
Merge commit 'df59f257583730470085db65c7faf44960c3b32e' into gingerbread-plus-aosp

* commit 'df59f257583730470085db65c7faf44960c3b32e':
  DO NOT MERGE Enable debug in StatusBarService
 2010-09-20 20:02:32 -07:00
Irfan Sheriff
df59f25758 Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 2010-09-20 19:51:39 -07:00
Mike Lockwood
537ce32c71 am 24956d36: am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 
Merge commit '24956d36f46dd7be0b029a7b2b43c1020ae8a4c5'

* commit '24956d36f46dd7be0b029a7b2b43c1020ae8a4c5':
  LocationManager: Hide location provider and geocode provider APIs.
 2010-09-20 19:33:58 -07:00
Dianne Hackborn
caa9aa08aa am 0ce12e21: (-s ours) am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 
Merge commit '0ce12e210eaef554e96752af2553dadc431d6d09'

* commit '0ce12e210eaef554e96752af2553dadc431d6d09':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
 2010-09-20 19:33:50 -07:00
Dianne Hackborn
fde5e965d4 am 65b5a65e: am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread 
Merge commit '65b5a65e790458be0d6f70fafa9e151ba22a9e2e'

* commit '65b5a65e790458be0d6f70fafa9e151ba22a9e2e':
  In theory the package manager now scans /vendor/app
 2010-09-20 19:33:46 -07:00
Scott Main
cd155a0672 am aac4630c: am a4270e7e: am 73e150c8: provide link to backup guide above the fold 
Merge commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957'

* commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957':
  provide link to backup guide above the fold
 2010-09-20 19:33:15 -07:00
Dianne Hackborn
48a781a0a5 am 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread 
Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339'

* commit '4b187e804fdfdbc825e17646e82e0218e316a339':
  Some battery improvements:
 2010-09-20 19:33:06 -07:00
Mindy Pereira
5b138e5984 am ee632159: am d3301e9f: Add mdpi images for overscroll EdgeGlow. 
Merge commit 'ee63215903db7ddd32f165f0a5a771700041f1ed'

* commit 'ee63215903db7ddd32f165f0a5a771700041f1ed':
  Add mdpi images for overscroll EdgeGlow.
 2010-09-20 19:32:32 -07:00
Steve Howard
9759df072e am 4735be02: am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread 
Merge commit '4735be0211a996f791accc77aeb399df2258ab4c'

* commit '4735be0211a996f791accc77aeb399df2258ab4c':
  New error status for "destination file already exists".
 2010-09-20 19:32:19 -07:00
John Wang
31fde0de8b am 48ab3991: am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread 
Merge commit '48ab3991647040d540d295a40247367f6707f4c2'

* commit '48ab3991647040d540d295a40247367f6707f4c2':
  Use PhoneBase in the phone list.
 2010-09-20 19:32:11 -07:00
Brian Swetland
23838860b0 am 5c746522: am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 
Merge commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7'

* commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
 2010-09-20 19:32:01 -07:00
Shimeng (Simon) Wang
77fdaaa3af Use max of content width and initial preferred width as the viewport. 
issue: 3003933
Change-Id: I4a901219674b575e8228d44381efbaa159912465
 2010-09-20 18:12:30 -07:00
Irfan Sheriff
2c9188e2c9 DO NOT MERGE Enable debug in StatusBarService 
This is a temporary enable to allow us to identify
the issue with multiple icons on StatusBar

Bug: 2984213
Change-Id: I36ac7baff6544c63fa44d9b2c7453bca6a33bd62
 2010-09-20 18:10:17 -07:00
Romain Guy
399542a7a3 Merge "Add support for SweepGradient in the GL renderer." 2010-09-20 17:55:58 -07:00
Romain Guy
ee916f14cb Add support for SweepGradient in the GL renderer. 
Change-Id: I7aa397ed4e34655ead9ba1f5b4ce087665e0f022
 2010-09-20 17:54:17 -07:00
Mike Lockwood
24956d36f4 am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 
Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp

* commit '307aef01257cbba42f095f7020a4a3b753f3807b':
  LocationManager: Hide location provider and geocode provider APIs.
 2010-09-20 17:19:04 -07:00
Mike Lockwood
307aef0125 Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 2010-09-20 17:16:03 -07:00
Mike Lockwood
e15735a9e0 LocationManager: Hide location provider and geocode provider APIs. 
Also rename Geocoder.isImplemented() to Geocoder.isPresent()

BUG: 3000738
BUG: 3001413

Change-Id: I56bb4e9a9c59f8b79de585eeb168f74c3ff1a853
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-20 20:14:34 -04:00
Dianne Hackborn
0ce12e210e am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
 2010-09-20 17:06:12 -07:00
Dianne Hackborn
e25a264c4e Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 2010-09-20 17:03:15 -07:00
Dianne Hackborn
c8314b05b4 DO NOT MERGE. Wifi service now blames apps for its wake lock use. 
Change-Id: Ic57d8f77527bbfea6a129b8f348fe9108157b4d8
 2010-09-20 16:58:41 -07:00
Dianne Hackborn
65b5a65e79 am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread 
Merge commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp

* commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3':
  In theory the package manager now scans /vendor/app
 2010-09-20 16:57:05 -07:00
Dianne Hackborn
4db643eb84 Merge "In theory the package manager now scans /vendor/app" into gingerbread 2010-09-20 16:54:22 -07:00
Mike Lockwood
c2d591247f Merge "CameraBrowser: show format in object info and show info for non-JPEG objects" 2010-09-20 16:52:51 -07:00
Mike Lockwood
f7399b4790 Merge "MTP: Fix typo that resulted in the MTP provider returning thumb format for object format" 2010-09-20 16:52:06 -07:00
Scott Main
aac4630cc5 am a4270e7e: am 73e150c8: provide link to backup guide above the fold 
Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp

* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
  provide link to backup guide above the fold
 2010-09-20 16:40:46 -07:00
Scott Main
a4270e7e1e am 73e150c8: provide link to backup guide above the fold 
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread

* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
  provide link to backup guide above the fold
 2010-09-20 16:37:32 -07:00
Dianne Hackborn
3b4bac7a2a In theory the package manager now scans /vendor/app 
Not tested.

Change-Id: Ib6120d645074c95dd0afd1476f6167aec5d50bb9
 2010-09-20 16:35:22 -07:00
Dianne Hackborn
4b187e804f am 8e1b84e7: Merge "Some battery improvements:" into gingerbread 
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
 2010-09-20 16:34:45 -07:00
Dianne Hackborn
8e1b84e765 Merge "Some battery improvements:" into gingerbread 2010-09-20 16:29:42 -07:00
Dianne Hackborn
ce2ef766ca Some battery improvements: 
- New API for iterating over history that will allow a better implementation
  in the future.
- Now do writes asynchronously.

Also improve the documentation for Activity.onRetainNonInstanceState().

Change-Id: Idf67f2796a8868eb62f288bcbb2bad29876c8554
 2010-09-20 16:25:01 -07:00
Mindy Pereira
ee63215903 am d3301e9f: Add mdpi images for overscroll EdgeGlow. 
Merge commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp

* commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c':
  Add mdpi images for overscroll EdgeGlow.
 2010-09-20 15:49:51 -07:00
Steve Howard
4735be0211 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread 
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
 2010-09-20 15:43:43 -07:00
Mindy Pereira
d3301e9f6b Add mdpi images for overscroll EdgeGlow. 
Fixes b/3019020 gingerbread needs overscroll resources for MDPI devices.

Change-Id: I42b2557d97f7766c30449f461090a05ef8e35c18
 2010-09-20 15:42:33 -07:00
Steve Howard
d2319d8d9a Merge "New error status for "destination file already exists"." into gingerbread 2010-09-20 15:40:41 -07:00
John Wang
48ab399164 am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread 
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp

* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
  Use PhoneBase in the phone list.
 2010-09-20 15:38:40 -07:00
John Wang
ee2ef3220f Merge "Use PhoneBase in the phone list." into gingerbread 2010-09-20 15:35:02 -07:00
Mike Lockwood
1779789b42 CameraBrowser: show format in object info and show info for non-JPEG objects 
Change-Id: I22b1906fecbf8609bc688a148180edc95fa1badf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-20 18:30:02 -04:00
Mike Lockwood
88fc2b85cb MTP: Fix typo that resulted in the MTP provider returning thumb format for object format 
BUG: 2994234

Change-Id: I99574043d3e0b310b9b7246f89b5b4a1e14fb5a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-20 18:29:59 -04:00
Scott Main
73e150c886 provide link to backup guide above the fold 
Change-Id: I84ad3fbd4c3c7793fbf330d6a2be5cab611a9b26
 2010-09-20 14:11:18 -07:00
Brian Swetland
5c7465220d am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 
Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp

* commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
 2010-09-20 14:08:46 -07:00
Brian Swetland
181e5ea808 Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 2010-09-20 14:05:25 -07:00
Steve Howard
a9e87c9cc3 New error status for "destination file already exists". 
Also changing the behavior of the local URI column slightly to better
match the spec -- it should return the client-provided destination so
that it's valid even if the download failed.

Change-Id: Ibf9c07519e647e677ebac8b334b9f2e930e47033
 2010-09-20 13:44:51 -07:00
Joe Onorato
d7b871419e Merge "Put the more notifications button on the left where it belongs." 2010-09-20 13:37:25 -07:00
Joe Onorato
83c5f31cad Put the more notifications button on the left where it belongs. 
Change-Id: I683c784de4d948d2cd3b9a8302bd224f565ee053
 2010-09-20 16:36:08 -04:00
Joe Onorato
cbb2d65ada Merge "Tapping outside the status bar panels closes them." 2010-09-20 13:25:07 -07:00
Joe Onorato
b62ac12782 Tapping outside the status bar panels closes them. 
Bug: 2994011
Change-Id: I0c5a28de5269f4136e6b118d5f6ac4aa38cd6d07
 2010-09-20 16:21:12 -04:00