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

9897 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
d1f4a17ea5 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-07-20 16:55:33 -07:00
Adam Powell
f20d6cf100 Merge "Fix a bug with closing action bar context modes" 2010-07-20 16:55:15 -07:00
Jason Parks
ed38cf9089 am bc4fcec7: am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7'

* commit 'bc4fcec70f841156f5e7fd16224e88cb3d551ca7':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 16:55:01 -07:00
Dan Egnor
43b237bd95 am c78f9a0e: am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67'

* commit 'c78f9a0e1ba931988144a52c54bc05a7e1521f67':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 16:54:57 -07:00
Dan Egnor
02b77f81cf am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 16:54:38 -07:00
Adam Powell
269b8bb0cb Fix a bug with closing action bar context modes 
Change-Id: I4f11549664f11cdc02d135288e05459007dbf0c8
 2010-07-20 16:46:42 -07:00
Romain Guy
2a0a47892d Merge "Add preliminary support for text rendering." 2010-07-20 16:43:31 -07:00
Romain Guy
a1db574036 Add preliminary support for text rendering. 
Change-Id: I547eb631dbda24d13960d54b4144fb8908fd8a49
 2010-07-20 16:37:27 -07:00
Vasu Nori
487fab6837 Merge "make disableWriteAheadLogging method public so apps can disable WAL" 2010-07-20 15:36:31 -07:00
Adam Powell
1e06193c2e Merge "Make sure action bar context modes reserve space for overflow menus on all devices." 2010-07-20 14:28:19 -07:00
Adam Powell
b366bbae2b Make sure action bar context modes reserve space for overflow menus on all devices. 
Change-Id: I393f041efef3852b7f3ee57c6a4c26ba176b2702
 2010-07-20 14:26:46 -07:00
Jason Parks
bc4fcec70f am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp

* commit '29e25bd3418b04e395119bf99abe92898830a796':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 14:04:41 -07:00
Dan Egnor
c78f9a0e1b am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp

* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 14:04:33 -07:00
Jason Parks
29e25bd341 Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 2010-07-20 14:01:39 -07:00
Dan Egnor
3c1363beec am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread

* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 13:59:43 -07:00
Dan Egnor
79102ad0f5 am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp

* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 13:58:57 -07:00
Dan Egnor
2f0dc6d9f5 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Danica Chang
eaeffac5fc Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" 2010-07-20 12:47:45 -07:00
Adam Powell
7bb66f3245 Merge "Action bar context mode support for overflow, submenus" 2010-07-20 12:15:08 -07:00
Adam Powell
2c9c9fe806 Action bar context mode support for overflow, submenus 
Change-Id: I951ae179698b08b6aba5b174b3d47f0cf847352e
 2010-07-20 12:08:07 -07:00
Dan Egnor
341ff13689 resolved conflicts for merge of 9bc4039a to gingerbread 
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
 2010-07-20 11:30:17 -07:00
Jean-Baptiste Queru
99a518ffab resolved conflicts for merge of ca48433a to master 
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
 2010-07-20 10:40:17 -07:00
Jason Parks
94b916da2c Only print out wake locks in the if the wakelock was held. 
Change-Id: I742121b70bd0e56ca2efe05fffa9fe3e4ad7b619
 2010-07-20 12:39:07 -05:00
The Android Open Source Project
ca48433afc merge from open-source master 
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
 2010-07-20 10:33:38 -07:00
Vasu Nori
7b04c4176d make disableWriteAheadLogging method public so apps can disable WAL 
music2 app has the weird situation where it embeds the jumper C++ code
and that code uses its own version of sqlite.
so, java side may want to disable WAL to make c++ code work well with java
usage of sqlite.
since WAL is made default option for all apps, this CL makes it possible for
music2 app to disable WAL.

Change-Id: I39ddbc9b4648f12b206ff3e76d30341da5955bd4
 2010-07-20 10:31:21 -07:00
The Android Open Source Project
bd7599ff0c am fcff6910: merge from open-source master 
Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'

* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
  typo fixed
 2010-07-20 10:28:35 -07:00
The Android Open Source Project
fcff691057 merge from open-source master 
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
 2010-07-20 10:25:37 -07:00
Dan Egnor
b3e4ef3702 COMMENT ONLY change to add some warnings about ParcelFileDescriptor 
behavior with Parcel.writeValue().

Change-Id: If55fcce29559379855735ff5297cf4f46d5d6be6
Bug: 2847738
 2010-07-20 10:24:38 -07:00
Chet Haase
358af100ed Merge "Fix bugs in Sequencer" 2010-07-20 10:07:53 -07:00
Romain Guy
c0ac193b94 Add support for linear gradients. 
Change-Id: Id15329da065045b3f06fdaed615f33cd57608496
 2010-07-19 18:44:05 -07:00
Dan Egnor
9bc4039a58 Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo 2010-07-19 18:14:50 -07:00
Daniel Lehmann
156add9575 Replace try-catch code by proper type checking. Saves an exception for each blob. 
Change-Id: I208ed0acb754391bd44b52887792563e92b39011
 2010-07-19 18:01:28 -07:00
Chet Haase
010dbaa123 Fix bugs in Sequencer 
Change-Id: I03aebe8d822bef0b9e163ba3280699ca02a6563c
 2010-07-19 17:41:03 -07:00
Winson Chung
121d7d86d2 Merge "Fixing build breakage due to misnamed javadoc variable." 2010-07-19 16:07:33 -07:00
Winson Chung
95362595ed Fixing build breakage due to misnamed javadoc variable. 
Change-Id: I883a53107d2c0fcd4544c85811aeaad3fc4f13c2
 2010-07-19 16:05:50 -07:00
Christian Mehlmauer
798e2d3d0c Replaced /sdcard with Environment.getExternalStorageDirectory() 
Change-Id: Id789f44a8569e307b1b7ab15eb266c9ce7ef2029
 2010-07-19 15:54:40 -07:00
Adam Powell
16ba106de5 Merge "Fix docs for MenuItem#setShowAsAction" 2010-07-19 15:52:02 -07:00
Adam Powell
ec66a3a9e0 Fix docs for MenuItem#setShowAsAction 
Change-Id: Id68273dde9c0ce904bca7b40aa2e9558880c55c2
 2010-07-19 15:51:17 -07:00
Adam Powell
3b1f1bce1c Merge "Fix bug 2852909 - screen density for contextual action bar" 2010-07-19 15:48:53 -07:00
Adam Powell
dcdefbbff2 Fix bug 2852909 - screen density for contextual action bar 
Change-Id: I9e3d8fe4e6f5eb0282cc103a98ed60ca2911c91e
 2010-07-19 15:46:48 -07:00
Madan Ankapura
ae96f634ec typo fixed 
Change-Id: Ie7cff39929ae53ce03409afadcae58548ec22cc8
 2010-07-19 15:43:00 -07:00
Vasu Nori
3766ed3eed am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
 2010-07-19 15:29:10 -07:00
Mason Tang
19f845804c Added support for full-text search in Calendar 
Change-Id: I716eba966ad072ac62a61f3cfbfe15b623f8ab94
 2010-07-19 15:28:23 -07:00
Vasu Nori
a5fe776a79 Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 2010-07-19 15:26:39 -07:00
Vasu Nori
345f39a8a3 fix javadoc error which breaks SDK build in gingerbread 
Change-Id: I01b90c71e7088f385a73f51144063a2fbe5d466b
 2010-07-19 15:25:32 -07:00
Winson Chung
456a00c4ae Merge "Initial changes to allow collections in widgets." 2010-07-19 15:02:33 -07:00
Winson Chung
499cb9f516 Initial changes to allow collections in widgets. 
Change-Id: I3cfa899bae88cd252912cecebc12e93c27a3b7c9
 2010-07-19 14:48:31 -07:00
Vasu Nori
6b98ece3e5 Merge "fix javadoc error" 2010-07-19 14:13:57 -07:00
Vasu Nori
fb5bccf229 fix javadoc error 
Change-Id: I387e2807af2ea6299a976e0763e6ad6f264543fe
 2010-07-19 14:11:54 -07:00
Danica Chang
cab94f75aa am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 
Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'

* commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
 2010-07-19 13:52:38 -07:00