Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,419 Commits 3 Branches 0 Tags
bbf3c24df934d7aced37e39d5e394adb09ee2a01
Commit Graph

726 Commits

Author SHA1 Message Date
Romain Guy
bbf3c24df9 am 4deb52f3: am 20777fae: am 584bce31: Merge change I09282f5b into eclair 
Merge commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372'

* commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372':
  Fix the build (hopefully.)
 2009-11-04 21:06:42 -08:00
Romain Guy
20777fae87 am 584bce31: Merge change I09282f5b into eclair 
Merge commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6' into eclair-mr2

* commit '584bce31b62cdf3efd8a9eb40442c4cc612ce1e6':
  Fix the build (hopefully.)
 2009-11-04 18:40:38 -08:00
Romain Guy
cca9e279f8 Fix the build (hopefully.) 
Change-Id: I09282f5b4ff8b97f6beb1073223d8a943d3ecef4
 2009-11-04 18:32:48 -08:00
Romain Guy
9ad1a218d7 am 77e68484: am 05abe8d0: am 131564d2: Merge change I3bbfb4f9 into eclair 
Merge commit '77e68484f5592e06ca1a881745070f7931641246'

* commit '77e68484f5592e06ca1a881745070f7931641246':
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 17:56:38 -08:00
Romain Guy
05abe8d01d am 131564d2: Merge change I3bbfb4f9 into eclair 
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-mr2

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 17:36:46 -08:00
Romain Guy
293451e4f0 Remove unused field and add new API to control the children drawing order. 
Approved by: xav, hackbod, mcleron.

Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
 2009-11-04 16:57:07 -08:00
Romain Guy
7aeca34250 am da8504a6: am 4d7860d4: am 9ed30f93: Merge change I96444af2 into eclair 
Merge commit 'da8504a65c66fa5b02faffcc6f920c6cf1dcd267'

* commit 'da8504a65c66fa5b02faffcc6f920c6cf1dcd267':
  Unhide View.isOpaque().
 2009-11-03 12:31:06 -08:00
Romain Guy
4d7860d408 am 9ed30f93: Merge change I96444af2 into eclair 
Merge commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84' into eclair-mr2

* commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84':
  Unhide View.isOpaque().
 2009-11-03 12:15:11 -08:00
Romain Guy
732046f874 Unhide View.isOpaque(). 
Change-Id: I96444af2a7e66a330a2c4b3fa0a173ec5ab4ed40
 2009-11-03 12:09:04 -08:00
Evan Millar
bc9052a372 am bce8f5f3: am 97c5a993: am 326eaa33: Merge change I0fae86b8 into eclair 
Merge commit 'bce8f5f3a0b262c469fa3169175d6ca004f418ff'

* commit 'bce8f5f3a0b262c469fa3169175d6ca004f418ff':
  Make QuickContact styles public.
 2009-11-03 11:19:29 -08:00
Evan Millar
97c5a99344 am 326eaa33: Merge change I0fae86b8 into eclair 
Merge commit '326eaa334da566c3dcae29b17f255c63c8bb919a' into eclair-mr2

* commit '326eaa334da566c3dcae29b17f255c63c8bb919a':
  Make QuickContact styles public.
 2009-11-03 11:04:53 -08:00
Evan Millar
0fae86b80f Make QuickContact styles public. 
This should have been done for the 2.0 sdk, but fell through the cracks.
Fortunately this will make it into the 2.1 sdk.
 2009-11-03 09:49:43 -08:00
Jesse Wilson
fcca5a95e6 Another round of API xml changes for the piped streams change 2009-11-02 17:38:23 -08:00
Jesse Wilson
0f4b9f91f6 Fix api.xml for piped stream changes (see change Ie098e2fa) 2009-11-02 16:41:53 -08:00
Fred Quintana
a421cda5a1 am c7749e4b: am 6b995479: am fae288c7: Merge change I9efe265f into eclair 
Merge commit 'c7749e4bf724e26a9be530b3baef2441533490f7'

* commit 'c7749e4bf724e26a9be530b3baef2441533490f7':
  unhide AccountManagerResponse
 2009-10-29 20:19:07 -07:00
Fred Quintana
6b9954790e am fae288c7: Merge change I9efe265f into eclair 
Merge commit 'fae288c7987f96df05e91ed154e934de267098be' into eclair-mr2

* commit 'fae288c7987f96df05e91ed154e934de267098be':
  unhide AccountManagerResponse
 2009-10-29 19:33:09 -07:00
Marco Nelissen
6411b4432b am 77f8a7a3: am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2 
Merge commit '77f8a7a37fe2c30e7bc9f5fc5523d5866f9a250f'

* commit '77f8a7a37fe2c30e7bc9f5fc5523d5866f9a250f':
  - add javadoc for the account manager
 2009-10-29 18:31:58 -07:00
Marco Nelissen
c81e43c8ee resolved conflicts for merge 31957f1b to eclair-mr2 2009-10-29 18:04:17 -07:00
Dianne Hackborn
f267b94765 am 9a27909e: am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclair 
Merge commit '9a27909e754b8b2623bbc82a931c2930c033cbb1'

* commit '9a27909e754b8b2623bbc82a931c2930c033cbb1':
  Add SDK version for MR1.
 2009-10-29 02:02:08 -07:00
Dianne Hackborn
40946aa201 am 1f668fff: Merge change Idb13ed9a into eclair 
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2

* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
  Add SDK version for MR1.
 2009-10-29 01:20:01 -07:00
Fred Quintana
9efe265f08 unhide AccountManagerResponse 2009-10-28 23:04:35 -07:00
Fred Quintana
31957f1bad - add javadoc for the account manager 
- add some checks to the AccountManagerService to keep it from crashing when a null is passed in
- cleaned up the API a bit
 2009-10-28 16:29:21 -07:00
Dianne Hackborn
0fa35918af Add SDK version for MR1. 
Change-Id: Idb13ed9a35397effbfb72a934a7db5f5a882c79c
 2009-10-26 17:40:52 -07:00
Dianne Hackborn
68ce35ec9a am 8368e510: am c6bead14: am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper 
Merge commit '8368e510a90ab30a9f850144f5adabb0455d26f9'

* commit '8368e510a90ab30a9f850144f5adabb0455d26f9':
  Implement feature #2117336: Create event communication APIs for live wallpaper
 2009-10-22 20:42:10 -07:00
Dianne Hackborn
c6bead14fe am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper 
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2

* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
  Implement feature #2117336: Create event communication APIs for live wallpaper
 2009-10-22 20:21:07 -07:00
Dianne Hackborn
7580493b01 Implement feature #2117336: Create event communication APIs for live wallpaper 
Note: currently only implements an async version (no result), and not yet
actually tested.

Change-Id: Id47ed045a4b0eb309ea8c58daf41a0e03eff1d3a
 2009-10-22 20:10:53 -07:00
Jesse Wilson
5113aaa7f5 Fix apicheck break. Adding synchronized to reset() is API compatible 2009-10-22 11:37:57 -07:00
Daisuke Miyakawa
3ed62302ea am ae27c576: am 54616f34: Make MockCursor class a part of public SDK. 
Merge commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a'

* commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a':
  Make MockCursor class a part of public SDK.
 2009-10-21 16:20:51 -07:00
Daisuke Miyakawa
54616f3435 Make MockCursor class a part of public SDK. 
With this class, external developers will be able to reduce their
redundant work related to testing around ContentProvider/ContentResolver.

Internal Issue number: 2181010
 2009-10-22 07:25:02 +09:00
Mark Wagner
6fdd2c5958 am da4204ca: am dad4780b: Merge change I3834b1cb into eclair-mr2 
Merge commit 'da4204caa487bc613e51684db457ef4be6a914fc'

* commit 'da4204caa487bc613e51684db457ef4be6a914fc':
  support for multiline paragraph style indentation
 2009-10-19 14:15:09 -07:00
Android (Google) Code Review
dad4780bbd Merge change I3834b1cb into eclair-mr2 
* changes:
  support for multiline paragraph style indentation
 2009-10-19 16:57:33 -04:00
Dianne Hackborn
50005e775d am dedcf1ee: am bf108426: am 007a429f: Update 5.xml with last minute changes. 
Merge commit 'dedcf1eefc153a33b6004608ecd4da0beec4e5a9'

* commit 'dedcf1eefc153a33b6004608ecd4da0beec4e5a9':
  Update 5.xml with last minute changes.
 2009-10-19 13:25:30 -07:00
Dianne Hackborn
bf10842617 am 007a429f: Update 5.xml with last minute changes. 
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-mr2

* commit '007a429f09fb9e4e4fbd4205d03878874c9f7957':
  Update 5.xml with last minute changes.
 2009-10-19 13:03:52 -07:00
Dianne Hackborn
007a429f09 Update 5.xml with last minute changes. 
Change-Id: I520ca879d31cb4581556138a73b542c070de3c00
 2009-10-19 12:42:28 -07:00
Mark Wagner
7b5676e4d4 support for multiline paragraph style indentation 
This change is likely incomplete and perhaps not right in other ways.
The gist of the change is that the span can return the number of lines
to which to apply the "leading margin".
Some specific things that should be looked at:

1) if the user has nested multiple
LeadingMarginSpans then they will inherit the "line count" feature.
This is wrong but I didn't want to spend time fixing it until it
was clear that this overall approach was acceptible.

2) The units for how many lines should indented is "lines" rather than
something like dips.

3) I wasn't sure what our strategy was for binary compatibility so
I didn't want to modify the methods in LeadingMarginSpan.  Instead I
made another interface with extends LeadingMarginSpan that has the
extra method to return the line count.
 2009-10-16 15:26:31 -07:00
Jesse Wilson
242a743608 API changes to accompany NIO update 802921. 
See  https://android-git.corp.google.com/g/30216
 2009-10-15 19:24:17 -07:00
Dmitri Plotnikov
101dbb3e07 am e020ff61: am 0a299af2: am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II 
Merge commit 'e020ff61750d8b1e9a4d8880391472598af173e3'

* commit 'e020ff61750d8b1e9a4d8880391472598af173e3':
  Making new Contacts APIs visible in Eclair SDK - Part II
 2009-10-14 07:56:55 -07:00
Dmitri Plotnikov
0a299af21f am fe4c8715: Making new Contacts APIs visible in Eclair SDK - Part II 
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-mr2

* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
  Making new Contacts APIs visible in Eclair SDK - Part II
 2009-10-14 07:38:11 -07:00
Dmitri Plotnikov
fe4c8715c0 Making new Contacts APIs visible in Eclair SDK - Part II 
Bug: http://b/2186595
Change-Id: Id87533c25cceb0fe3b0845aed10912c937679f45
 2009-10-14 00:28:53 -07:00
Jesse Wilson
64a1ff596d API and preloaded classes updates to corespond to the luni r823222 update. 
See https://android-git.corp.google.com/g/29602
 2009-10-13 23:57:49 -07:00
Dmitri Plotnikov
8f26c13e59 am 767741ff: am 0741c134: am 6e144ad8: Making new Contacts APIs visible in Eclair SDK 
Merge commit '767741ffd5d14471b88791e5db93c08e8d2571eb'

* commit '767741ffd5d14471b88791e5db93c08e8d2571eb':
  Making new Contacts APIs visible in Eclair SDK
 2009-10-13 20:10:00 -07:00
Dmitri Plotnikov
0741c13464 am 6e144ad8: Making new Contacts APIs visible in Eclair SDK 
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2

* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
  Making new Contacts APIs visible in Eclair SDK
 2009-10-13 18:47:40 -07:00
Dmitri Plotnikov
6e144ad885 Making new Contacts APIs visible in Eclair SDK 
Bug: http://b/2186595
 
Change-Id: Iaba8514276299504af6ab0714577eb37d9608237
 2009-10-13 18:24:08 -07:00
Jeff Hamilton
edd3d917af am a4b0c0d0: am 5d93de73: am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such. 
Merge commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601'

* commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
 2009-10-13 16:59:15 -07:00
Dianne Hackborn
8500fb921b am 81efcdfe: am 8a98a26a: am ee110be0: Fix issue #2179891: Need to update 5.xml 
Merge commit '81efcdfee658710bd267e6f335d7cf505224492b'

* commit '81efcdfee658710bd267e6f335d7cf505224492b':
  Fix issue #2179891: Need to update 5.xml
 2009-10-13 16:58:40 -07:00
James Dong
ead92ef490 am 6195432b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'

* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
  Fix issue #2176944: Need API so browser, others can determine memory size of device
  Fix issue #2177262: Improve animations
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
 2009-10-13 12:10:02 -07:00
Nick Pelly
dffcd85541 am b2ad0f18: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84'

* commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84':
  Introduce BluetoothAdapter.getDefaultAdapter().
 2009-10-12 12:38:48 -07:00
David 'Digit' Turner
de553351bf am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117'

* commit '4c220bd0f32b93314c4c1bff328bd815265ef117':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
 2009-10-12 12:36:03 -07:00
Fred Quintana
a1933d7dfc am 7fc5e5ab: am f9f7718f: am f038004f: changes from Sync Manager API Review: bug 2164262 
Merge commit '7fc5e5ab6d404d13136d30b724975798717f57f0'

* commit '7fc5e5ab6d404d13136d30b724975798717f57f0':
  changes from Sync Manager API Review: bug 2164262
 2009-10-12 12:28:37 -07:00
Ray Chen
9b98e49f62 am 2f2634e5: am 13ed5750: Add group id to getThumbnail and cancelThumbnailRequest API. 
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'

* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
  Add group id to getThumbnail and cancelThumbnailRequest API.
 2009-10-12 11:48:10 -07:00