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

31556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Brian Swetland
a21c2009f1 support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl 
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
 2010-09-20 12:58:15 -07:00
Amith Yamasani
3d519e9ad2 Merge "Fix attribute parsing of PreferenceHeader_id" 2010-09-20 11:26:02 -07:00
Joe Onorato
a11dde3e4e Merge "Tablet ticker." 2010-09-20 11:18:48 -07:00
Joe Onorato
ef1e7763c2 Tablet ticker. 
Change-Id: Ia3db5cc29eac1703123de3e1c6dc7c22e7d024eb
 2010-09-20 14:14:02 -04:00
Dmitri Plotnikov
6cb73f2a72 Merge "Format the phone number with the number country's convention." 2010-09-20 10:43:34 -07:00
Kristian Monsen
4200dcaa7b Merge "HTTP auth for Chromium HTTP stack (Java side)" 2010-09-20 05:52:53 -07:00
Bai Tao
6a3d188f18 Format the phone number with the number country's convention. 
If the phone number doesn't have country code, the current country's convention will be used.

Change-Id: I3f6ea0104d1a67071bd3beadb667c7159e915eef
 2010-09-20 18:18:41 +08:00
Hung-ying Tyan
5491c7a076 am 852e5354: am 8544560c: SipPhone: fix missing-call DisconnectCause feedback 
Merge commit '852e5354f60a0131692c46f509c2e9901b0b6810'

* commit '852e5354f60a0131692c46f509c2e9901b0b6810':
  SipPhone: fix missing-call DisconnectCause feedback
 2010-09-20 00:58:08 -07:00
Hung-ying Tyan
852e5354f6 am 8544560c: SipPhone: fix missing-call DisconnectCause feedback 
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
  SipPhone: fix missing-call DisconnectCause feedback
 2010-09-20 00:51:07 -07:00
Hung-ying Tyan
8544560ccc SipPhone: fix missing-call DisconnectCause feedback 
also fix delivering bad news before closing a SipAudioCallImpl object so that
apps can get the current audio-call object state before it's closed:

http://b/issue?id=3009262

Change-Id: I94c19dae8b4f252de869e614ec462b19b4ff2077
 2010-09-20 13:06:30 +08:00
Hung-ying Tyan
23fd61b188 am 97bc368b: am b17eae9e: SipService: move event handling out of system server\'s main thread 
Merge commit '97bc368bc445c0015de6dd6557feff0dd5527d9d'

* commit '97bc368bc445c0015de6dd6557feff0dd5527d9d':
  SipService: move event handling out of system server's main thread
 2010-09-19 19:17:18 -07:00
Hung-ying Tyan
97bc368bc4 am b17eae9e: SipService: move event handling out of system server\'s main thread 
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp

* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
  SipService: move event handling out of system server's main thread
 2010-09-19 19:14:30 -07:00
Hung-ying Tyan
b17eae9e22 SipService: move event handling out of system server's main thread 
http://b/issue?id=2998047

Change-Id: Ibe0b6a19bb8b453fa852a94b3daf3cb80d7377b0
 2010-09-20 10:10:34 +08:00
Hung-ying Tyan
2417132611 am 37d1b249: am 97963794: SIP: convert enum to static final int. 
Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'

* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
  SIP: convert enum to static final int.
 2010-09-19 18:59:43 -07:00
Hung-ying Tyan
37d1b2496e am 97963794: SIP: convert enum to static final int. 
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
  SIP: convert enum to static final int.
 2010-09-19 18:56:27 -07:00