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

757 Commits

Author SHA1 Message Date
Dianne Hackborn
fc19a92334 am 794bfed0: am 2934bc1c: am 644693f4: Merge change Ic42763b1 into eclair 
Merge commit '794bfed0b9d8fded77cf096213cfb36cf43189ba'

* commit '794bfed0b9d8fded77cf096213cfb36cf43189ba':
  Fix issue #2242440: Window screen brightness attribute is broken
 2009-11-09 16:29:48 -08:00
Dianne Hackborn
2934bc1c43 am 644693f4: Merge change Ic42763b1 into eclair 
Merge commit '644693f4caf2364a0e811dca13304788e2c8fee8' into eclair-mr2

* commit '644693f4caf2364a0e811dca13304788e2c8fee8':
  Fix issue #2242440: Window screen brightness attribute is broken
 2009-11-09 16:14:38 -08:00
Jeff Sharkey
1cbbec066d am 4024c46f: am 06dc03f2: Let RemoteViews nest children, allow ViewFlipper. 
Merge commit '4024c46f91564ac49e022c5fcef85b8c6dba150b'

* commit '4024c46f91564ac49e022c5fcef85b8c6dba150b':
  Let RemoteViews nest children, allow ViewFlipper.
 2009-11-09 12:11:54 -08:00
Dianne Hackborn
badc47ecd1 Fix issue #2242440: Window screen brightness attribute is broken 
Um okay, that was dumb.  And I guess this means it is time to make 6.xml.

Change-Id: Ic42763b1c8a13448cf6db20b4cd6daadc7786ac1
 2009-11-08 17:37:50 -08:00
Jeff Sharkey
06dc03f2cf Let RemoteViews nest children, allow ViewFlipper. 
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews.  These nested views
are inflated and treated as addView() calls.

This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen.

Fixes http://b/2239905
 2009-11-08 14:14:40 -08:00
Grace Kloba
62c5183a66 am f7dec4a7: am d9e22ed8: am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK. 
Merge commit 'f7dec4a7986c8d4034d9b029b315bfef4f73158e'

* commit 'f7dec4a7986c8d4034d9b029b315bfef4f73158e':
  Remove "@hide pending API council" in webkit to expose
 2009-11-07 11:18:15 -08:00
Charles Mendis
1d65f4d4c1 am 2689808c: am 704af39c: am 638d8653: Merge change I47ef4266 into eclair 
Merge commit '2689808c79d16826dbd3596183fae03c788fb130'

* commit '2689808c79d16826dbd3596183fae03c788fb130':
  Expose WallpaperSettingsActivity in the public API.
 2009-11-07 11:18:00 -08:00
Grace Kloba
d9e22ed8fe am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK. 
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-mr2

* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
  Remove "@hide pending API council" in webkit to expose
 2009-11-07 10:57:18 -08:00
Grace Kloba
0691ad50ca Remove "@hide pending API council" in webkit to expose 
the apis to SDK.

Remove @hide in GeolocationPermissions and WebStorage
to expose them to the SDK users.

Remove @hide for freeMemory() in WebView.

Remove @hide comment in CallbackProxy and
GoogleLocationSettingManager as they are not public class.
 2009-11-07 10:39:07 -08:00
Charles Mendis
704af39c28 am 638d8653: Merge change I47ef4266 into eclair 
Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-mr2

* commit '638d86535264b24b54698fca7e18e68571fe0bad':
  Expose WallpaperSettingsActivity in the public API.
 2009-11-06 22:12:16 -08:00
Charles Mendis
47ef426679 Expose WallpaperSettingsActivity in the public API. 2009-11-06 18:06:06 -08:00
Charles Mendis
08c2fd1ecc am 7e3873a0: am 6b07bf3d: am 3cba7288: Merge change I6ccd2ebc into eclair 
Merge commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7'

* commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7':
  Expose PowerManager.isScreenOn in the public api.
 2009-11-06 12:00:57 -08:00
Charles Mendis
6b07bf3d8f am 3cba7288: Merge change I6ccd2ebc into eclair 
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
 2009-11-06 11:46:43 -08:00
Charles Mendis
322591cb4b Expose PowerManager.isScreenOn in the public api. 
Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
 2009-11-06 14:37:07 -05:00
Xavier Ducrohet
19860554a4 am f6d023ec: am bef17491: am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants. 
Merge commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90'

* commit 'f6d023ec93b461e874687f52deec1fc30cc8ea90':
  New API 4 with new CDMA constants.
 2009-11-06 10:28:57 -08:00
Xavier Ducrohet
bef1749148 am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants. 
Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-mr2

* commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed':
  New API 4 with new CDMA constants.
 2009-11-06 10:08:03 -08:00
Xavier Ducrohet
9eaff61adf am 91bb62f0: New API 4 with new CDMA constants. 
Merge commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair

* commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9':
  New API 4 with new CDMA constants.
 2009-11-06 10:00:29 -08:00
Dianne Hackborn
62834b829c am 85fdfd01: am 237cc15c: am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK 
Merge commit '85fdfd0144c06dcef7652a8dd283f717cabe8759'

* commit '85fdfd0144c06dcef7652a8dd283f717cabe8759':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
 2009-11-05 20:57:33 -08:00
Romain Guy
9aed49e2a5 am 57e7109d: am 15b9de8c: am 1d5b3a63: Fix the build 
Merge commit '57e7109d13e17ca5b4a8a4b9e3fd952f1afcaf75'

* commit '57e7109d13e17ca5b4a8a4b9e3fd952f1afcaf75':
  Fix the build
 2009-11-05 20:57:09 -08:00
Dianne Hackborn
237cc15c17 am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK 
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-mr2

* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
 2009-11-05 20:41:50 -08:00
Dianne Hackborn
274b120f39 Fix issue #2243096: Need to expose live wallpaper APIs in SDK 
Change-Id: I7e996bf549922c1bb8e8c00d051650ffe12d818c
 2009-11-05 20:35:23 -08:00
Romain Guy
15b9de8cf2 am 1d5b3a63: Fix the build 
Merge commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0' into eclair-mr2

* commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0':
  Fix the build
 2009-11-05 20:27:53 -08:00
Jean-Michel Trivi
76dfdad08f am 5a76b6df: am 571529f8: am d94ed379: Merge change I1dc2ae28 into eclair 
Merge commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db'

* commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db':
  Fix bug 2242585 to unhide the new audio recording sources.
 2009-11-05 20:18:04 -08:00
Romain Guy
1d5b3a631c Fix the build 
Change-Id: Id7514858594772ab79c0f3db745b00f0bb59218b
 2009-11-05 18:45:10 -08:00
Jean-Michel Trivi
571529f821 am d94ed379: Merge change I1dc2ae28 into eclair 
Merge commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162' into eclair-mr2

* commit 'd94ed3794c68b93ac9faa357bb3517f4fae88162':
  Fix bug 2242585 to unhide the new audio recording sources.
 2009-11-05 16:10:32 -08:00
Jean-Michel Trivi
1dc2ae2871 Fix bug 2242585 to unhide the new audio recording sources. 
Unhide CAMCORDER and VOICE_RECOGNITION in android.media.MediaRecorder
 2009-11-05 15:49:37 -08:00
Daniel Sandler
b3c8a3ff50 am c3c2f766: am 1bca7612: am eca41b31: Merge change Id1458b01 into eclair 
Merge commit 'c3c2f76682151c5051a02269b1990b6644a9074c'

* commit 'c3c2f76682151c5051a02269b1990b6644a9074c':
  New live wallpaper API to expose author and description strings.
 2009-11-05 14:12:30 -08:00
Daniel Sandler
1bca7612df am eca41b31: Merge change Id1458b01 into eclair 
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.
 2009-11-05 13:54:40 -08:00
Xavier Ducrohet
91bb62f0dc New API 4 with new CDMA constants. 2009-11-05 12:41:10 -08:00
Daniel Sandler
18a509d8fa New live wallpaper API to expose author and description strings. 
First in a sequence of CLs to address
http://b/issue?id=2235307 .

Change-Id: Id1458b01c8a7918f345823b45e5726e02285d8b5
 2009-11-05 15:05:27 -05:00
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