ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
21,646 Commits 2 Branches 0 Tags 54 MiB
d6d93dbb86
Commit Graph

21646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
768c49d128 resolved conflicts for merge of 749e6bc5 to master 
Change-Id: Ica492307505d53e57863d4363b5f75abd798bcd8
 2010-09-21 10:27:59 -07:00
James Dong
49bc696788 am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
 2010-09-21 10:24:10 -07:00
Jean-Baptiste Queru
808a411945 am 7869f08c: Merge "MOTOYA Japanese fonts" 
Merge commit '7869f08c55d774b0006c2260e87747ff5e0746f2' into gingerbread-plus-aosp

* commit '7869f08c55d774b0006c2260e87747ff5e0746f2':
  MOTOYA Japanese fonts
 2010-09-21 10:21:37 -07:00
James Dong
f65d7c0669 Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 2010-09-21 10:19:22 -07:00
Jean-Baptiste Queru
b11c8ae887 Merge "MOTOYA Japanese fonts" 2010-09-21 10:09:12 -07:00
Cary Clark
e83ef8b061 Merge "In clearView(), see if native exists before calling it." 2010-09-21 09:36:50 -07:00
Shimeng (Simon) Wang
89bb9aff31 Merge "Use dimension value instead of fixed constant in code." 2010-09-21 09:36:35 -07:00
Shimeng (Simon) Wang
eaeb5b09ae Merge "Use max of content width and initial preferred width as the viewport." 2010-09-21 09:29:32 -07:00
Wu-cheng Li
6492c6ff6d am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO. 
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp

* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
 2010-09-21 08:57:15 -07:00
Mike Lockwood
91fd8f7085 am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 
Merge commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9' into gingerbread-plus-aosp

* commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9':
  SystemUI: Use new USB notifications to detect USB disconnect.
 2010-09-21 08:48:15 -07:00
Mike Lockwood
a59fba9eac Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 2010-09-21 08:45:34 -07:00
Robert Greenwalt
d2818bad1c am 6548f395: Merge "Inet status bug fix" into gingerbread 
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
 2010-09-21 08:22:59 -07:00
Robert Greenwalt
2d1b598549 Merge "Inet status bug fix" into gingerbread 2010-09-21 08:06:15 -07:00
Dianne Hackborn
a925619bae am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 
Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp

* commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
 2010-09-21 00:27:06 -07:00
Dianne Hackborn
cf93d7e873 Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 2010-09-21 00:24:23 -07:00
Chung-yih Wang
fd0e2a86c1 am 4c571a62: Fix the build. 
Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp

* commit '4c571a62b1a4fb71585179bce84246b55097b47e':
  Fix the build.
 2010-09-20 22:48:09 -07:00
Dianne Hackborn
a13253d0b4 am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp

* commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d':
  Fix #2999258: ANR in Settings after every reboot
 2010-09-20 22:22:54 -07:00
Dianne Hackborn
e228f82f6a Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread 2010-09-20 22:19:47 -07:00
Chung-yih Wang
55d51aed82 am 708e4251: Merge "Revert the ANSWERING state." into gingerbread 
Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp

* commit '708e42512a8b14202cd872d96d1f071ccb4cf915':
  Revert the ANSWERING state.
 2010-09-20 22:06:49 -07:00
Chung-yih Wang
4e89ce3f98 Merge "Revert the ANSWERING state." into gingerbread 2010-09-20 22:04:57 -07:00
Robert Greenwalt
6201fc3bb7 am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread 
Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports
 2010-09-20 21:31:29 -07:00
Robert Greenwalt
e0fb13866e Merge "Add Inet Condition log to bugreports" into gingerbread 2010-09-20 21:29:02 -07:00
Irfan Sheriff
3f9e3c8ce2 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
e6f5e643e6 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
b98e0dd728 Merge "DO NOT MERGE Enable debug in StatusBarService" into gingerbread 2010-09-20 19:51:39 -07:00
Mike Lockwood
e4875ae58c 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
c4a5cff339 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
c88dea4958 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
e64d27c043 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
0778a9713d 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
8057d70510 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
784dca5ce6 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
2603eb319b 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
04b9ff8e26 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
4f612e9f25 Merge "Add support for SweepGradient in the GL renderer." 2010-09-20 17:55:58 -07:00
Mike Lockwood
4313b5a780 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
abbf805c91 Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 2010-09-20 17:16:03 -07:00
Dianne Hackborn
44bfeb931d 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
2f516cddac 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
295b9e65f0 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
6473500135 Merge "In theory the package manager now scans /vendor/app" into gingerbread 2010-09-20 16:54:22 -07:00
Mike Lockwood
ac66282941 Merge "CameraBrowser: show format in object info and show info for non-JPEG objects" 2010-09-20 16:52:51 -07:00
Mike Lockwood
13923a2fd4 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
259c28f6f0 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
37f2d1a005 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
dd7b6bb3f9 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
95ca338d1a Merge "Some battery improvements:" into gingerbread 2010-09-20 16:29:42 -07:00
Mindy Pereira
fb744481e5 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
4f2f7f6421 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
Steve Howard
642b2d271d Merge "New error status for "destination file already exists"." into gingerbread 2010-09-20 15:40:41 -07:00