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

15002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
c721389c45 am b0396681: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp 
Merge commit 'b03966815581c367269f10dd2c832e8c4414c68d'

* commit 'b03966815581c367269f10dd2c832e8c4414c68d':
  Fix 2268841: Much better looking layout for pattern lock screen.
 2009-11-18 00:46:52 -08:00
Jim Miller
86103cd7db resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp 2009-11-18 00:36:32 -08:00
Android (Google) Code Review
a3dbee32d1 Merge change I919c20bb into eclair-mr2 
* changes:
  Code clean up.
 2009-11-18 00:19:52 -08:00
Daisuke Miyakawa
49c0decf46 Code clean up. 
Internal issue number: 2195990
 2009-11-18 17:18:53 +09:00
Jim Miller
b039668155 resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp 2009-11-17 23:20:37 -08:00
Dan Egnor
724bfd5af6 resolved conflicts for merge of 5a0db121 to master 2009-11-17 23:05:41 -08:00
Jim Miller
ee3fd99a0b am 30998a59: Merge change I587dd820 into eclair 
Merge commit '30998a59aced3248b3a6f5e507dba0394fb54cad' into eclair-mr2

* commit '30998a59aced3248b3a6f5e507dba0394fb54cad':
  Fix 2268841: Much better looking layout for pattern lock screen.
 2009-11-17 22:58:23 -08:00
Android (Google) Code Review
30998a59ac Merge change I587dd820 into eclair 
* changes:
  Fix 2268841: Much better looking layout for pattern lock screen.
 2009-11-17 22:53:44 -08:00
Dan Egnor
8468c19049 am 5021e08d: am 9a5985a8: Merge change I24e47245 into eclair-mr2 
Merge commit '5021e08d58fc32e0a9a21a11196590da14ab8cd5'

* commit '5021e08d58fc32e0a9a21a11196590da14ab8cd5':
  Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.
 2009-11-17 22:03:17 -08:00
Dan Egnor
5a0db121c8 am d68d6c6d: Merge change I0629175f into eclair-mr2 
Merge commit 'd68d6c6ddabb6bc1e78b38c9c2dd6beda7970f8d' into eclair-mr2-plus-aosp

* commit 'd68d6c6ddabb6bc1e78b38c9c2dd6beda7970f8d':
  Remove googleclient from the framework, and its classes from the preload list.
 2009-11-17 21:57:54 -08:00
Dan Egnor
5021e08d58 am 9a5985a8: Merge change I24e47245 into eclair-mr2 
Merge commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e' into eclair-mr2-plus-aosp

* commit '9a5985a8d975f88e314a321392cc7e25bd14ad0e':
  Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.
 2009-11-17 21:57:38 -08:00
Android (Google) Code Review
d68d6c6dda Merge change I0629175f into eclair-mr2 
* changes:
  Remove googleclient from the framework, and its classes from the preload list.
 2009-11-17 21:54:59 -08:00
Dan Egnor
0629175f50 Remove googleclient from the framework, and its classes from the preload list. 2009-11-17 21:06:45 -08:00
Android (Google) Code Review
f5fac58f50 Merge change Id10824da 
* changes:
  Fix film init
 2009-11-17 18:53:07 -08:00
Jason Sams
d10824dadc Fix film init 2009-11-17 18:51:58 -08:00
Android (Google) Code Review
9390931b6e Merge change I948415fd 
* changes:
  Delete the old rollo sample which is obsolete.
 2009-11-17 18:51:25 -08:00
Jason Sams
948415fdd9 Delete the old rollo sample which is obsolete. 2009-11-17 18:50:09 -08:00
Jim Miller
587dd820b5 Fix 2268841: Much better looking layout for pattern lock screen. 2009-11-17 18:31:33 -08:00
Eric Fischer
f9cf96ae1d am 1f60ff34: am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair 
Merge commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06'

* commit '1f60ff34cd353235eedb20bd0c6e2d4a1e6bcc06':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
 2009-11-17 18:11:48 -08:00
Daisuke Miyakawa
18b5fc06af am 7798d36a: am d2f813c3: Merge change I60cfe9ce into eclair-mr2 
Merge commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8'

* commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8':
  Add unit tests.
 2009-11-17 18:11:19 -08:00
Jason Sams
644a0e320d resolved conflicts for merge of f6309041 to master 2009-11-17 18:07:54 -08:00
Android (Google) Code Review
9a5985a8d9 Merge change I24e47245 into eclair-mr2 
* changes:
  Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox. Optimize DropBoxManagerService.dump() a bit.
 2009-11-17 18:02:12 -08:00
Dan Egnor
3d40df335e Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox. 
Optimize DropBoxManagerService.dump() a bit.
 2009-11-17 18:00:48 -08:00
Eric Fischer
1f60ff34cd am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair 
Merge commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435' into eclair-mr2-plus-aosp

* commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
 2009-11-17 17:59:09 -08:00
Eric Fischer
e45ebbaf1b am 04a0e969: Merge change Id7c432bf into eclair 
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-mr2

* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
 2009-11-17 17:54:31 -08:00
Android (Google) Code Review
04a0e969c6 Merge change Id7c432bf into eclair 
* changes:
  Add vertical bar to the alt-space character picker for the hardware keyboard.
 2009-11-17 17:51:37 -08:00
Jaikumar Ganesh
e30c29feea am bc9f6292: am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair 
Merge commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d'

* commit 'bc9f62920aa7cc436cd1934bc7dfa1e9e70cd96d':
  Check if Bluetooth is enabled before making any calls down.
 2009-11-17 17:45:22 -08:00
Daisuke Miyakawa
7798d36a46 am d2f813c3: Merge change I60cfe9ce into eclair-mr2 
Merge commit 'd2f813c3f85060d42744be2632fed20f520001ee' into eclair-mr2-plus-aosp

* commit 'd2f813c3f85060d42744be2632fed20f520001ee':
  Add unit tests.
 2009-11-17 17:41:17 -08:00
Jason Sams
f630904134 am f56f317f: am fa0394c9: Merge change I715333b8 into eclair 
Merge commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4' into eclair-mr2-plus-aosp

* commit 'f56f317fb941c354c3a10e9fbf36d194656fa7d4':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
 2009-11-17 17:41:02 -08:00
Jaikumar Ganesh
bc9f62920a am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair 
Merge commit '4fea2919abeba149376fed98a14e3ffc8464eadf' into eclair-mr2-plus-aosp

* commit '4fea2919abeba149376fed98a14e3ffc8464eadf':
  Check if Bluetooth is enabled before making any calls down.
 2009-11-17 17:40:45 -08:00
Android (Google) Code Review
d2f813c3f8 Merge change I60cfe9ce into eclair-mr2 
* changes:
  Add unit tests.
 2009-11-17 17:38:07 -08:00
Jason Sams
f56f317fb9 am fa0394c9: Merge change I715333b8 into eclair 
Merge commit 'fa0394c9f89f13b53c6db2470253825b88cafb64' into eclair-mr2

* commit 'fa0394c9f89f13b53c6db2470253825b88cafb64':
  Add support for dumping RS objects to aid in debugging of white blocks bug.
 2009-11-17 17:35:44 -08:00
Daisuke Miyakawa
839c036444 Add unit tests. 
Internal issue number: 2195990
 2009-11-18 10:35:39 +09:00
Jaikumar Ganesh
4fea2919ab am 660282dc: Merge change I706fe6b0 into eclair 
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-mr2

* commit '660282dc3e81784224945be0787a9e2d4276de8c':
  Check if Bluetooth is enabled before making any calls down.
 2009-11-17 17:35:25 -08:00
Android (Google) Code Review
fa0394c9f8 Merge change I715333b8 into eclair 
* changes:
  Add support for dumping RS objects to aid in debugging of white blocks bug.
 2009-11-17 17:31:58 -08:00
Jason Sams
715333b832 Add support for dumping RS objects to aid in debugging of white blocks bug. 2009-11-17 17:26:46 -08:00
Eric Fischer
d7c432bf7f Add vertical bar to the alt-space character picker for the hardware keyboard. 
Bug 2242177

Approver: jerryw
 2009-11-17 16:28:30 -08:00
Evan Millar
813d11a91a am a6780991: am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair 
Merge commit 'a67809918f6c212630da0b359628d0e8722b091f'

* commit 'a67809918f6c212630da0b359628d0e8722b091f':
  Move photo querying off main thread.
 2009-11-17 16:14:15 -08:00
Ray Chen
78bcc8660e am edc1b064: am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair 
Merge commit 'edc1b064ee1da7bca9d9a6114e984962b2633530'

* commit 'edc1b064ee1da7bca9d9a6114e984962b2633530':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
 2009-11-17 16:13:57 -08:00
Joe Onorato
8470924a6d am 95230656: am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in 
Merge commit '95230656e46ee7e236f6bb02de1334659a2d1244'

* commit '95230656e46ee7e236f6bb02de1334659a2d1244':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
 2009-11-17 16:13:37 -08:00
Mark Wagner
69020b7325 am fe537b3f: am 0e3fccf1: Merge change Icef599ec into eclair-mr2 
Merge commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5'

* commit 'fe537b3fe4145e3cec41b70b93c366e1c2307ed5':
  null check
 2009-11-17 16:13:16 -08:00
Android (Google) Code Review
660282dc3e Merge change I706fe6b0 into eclair 
* changes:
  Check if Bluetooth is enabled before making any calls down.
 2009-11-17 16:07:58 -08:00
Evan Millar
a67809918f am e53c9a81: am 6bcd99c2: Merge change I1b6d202b into eclair 
Merge commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af' into eclair-mr2-plus-aosp

* commit 'e53c9a81e5208bc51ee8e365f19ff867897e63af':
  Move photo querying off main thread.
 2009-11-17 16:05:58 -08:00
Ray Chen
edc1b064ee am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair 
Merge commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc' into eclair-mr2-plus-aosp

* commit 'ae9dd9b77d37b430459b55120c13553dc5e67cfc':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
 2009-11-17 16:05:43 -08:00
Joe Onorato
95230656e4 am 0036b4de: am df7dbb68: Fix bug 2252145 - Notification panel not closing completely when a call comes in 
Merge commit '0036b4def5242429abdf6e8e420896eb5296316e' into eclair-mr2-plus-aosp

* commit '0036b4def5242429abdf6e8e420896eb5296316e':
  Fix bug 2252145 - Notification panel not closing completely when a call comes in
 2009-11-17 16:05:27 -08:00
Mark Wagner
fe537b3fe4 am 0e3fccf1: Merge change Icef599ec into eclair-mr2 
Merge commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1' into eclair-mr2-plus-aosp

* commit '0e3fccf1a525883aa5d80e10ced5b7af48cfe5a1':
  null check
 2009-11-17 16:05:12 -08:00
Andreas Huber
4788b3148b am 39dc5104: am 2c766498: Merge change Iea6a38c6 into eclair-mr2 
Merge commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916'

* commit '39dc51040f9b766adaa9ee487bb0568a2ed1c916':
  Squashed commit of the following:
 2009-11-17 15:10:44 -08:00
Andreas Huber
3fc9f51494 am ed9880f3: am a35f1c63: Merge change Ib64ea2dd into eclair-mr2 
Merge commit 'ed9880f399015782c9f635db744d25281d0deeb4'

* commit 'ed9880f399015782c9f635db744d25281d0deeb4':
  Improvements to TimedEventQueue.
 2009-11-17 15:10:25 -08:00
Andreas Huber
4ed0fab49d am 775508d9: am 744043fc: Update FileSource to also accept a file descriptor and a range. 
Merge commit '775508d97f709e621f9d1540aca819224fbdcebf'

* commit '775508d97f709e621f9d1540aca819224fbdcebf':
  Update FileSource to also accept a file descriptor and a range.
 2009-11-17 15:10:07 -08:00
Daisuke Miyakawa
ead23abbd6 am 50963b1a: am 8c808187: Modify test code a little. 
Merge commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68'

* commit '50963b1aa5c2828b46a4e0acf7626b8aef83ef68':
  Modify test code a little.
 2009-11-17 15:08:08 -08:00