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

12498 Commits

Author SHA1 Message Date
Wu-cheng Li
fd83b2f92e am 77a473fb: am ccaa0028: Merge "Improve camera documentation." into gingerbread 
Merge commit '77a473fbcea0214832255af91e0a65d853757aae'

* commit '77a473fbcea0214832255af91e0a65d853757aae':
  Improve camera documentation.
 2010-08-12 14:07:59 -07:00
Wu-cheng Li
77a473fbce am ccaa0028: Merge "Improve camera documentation." into gingerbread 
Merge commit 'ccaa002848e9ef1ff232eee5babc9273599924af' into gingerbread-plus-aosp

* commit 'ccaa002848e9ef1ff232eee5babc9273599924af':
  Improve camera documentation.
 2010-08-12 14:05:56 -07:00
Wu-cheng Li
699fe93979 Improve camera documentation. 
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
 2010-08-12 14:00:14 -07:00
Leon Scroggins III
6f99270cbe Hide the soft keyboard even if WebTextView is not in use. 
Sometimes clearTextEntry is called when mWebTextView is not
being used.  In those cases, we still want to hide the soft
keyboard, since the user is no longer attempting to type.

Bug: 2835685
Change-Id: I4e8d4bc60b23028e2840d6205caf13699bce6031
 2010-08-12 14:45:38 -04:00
John Huang
81a81f02d6 am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'

* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
  Enhance WspTypeDecoder to decode Content Type Parameters
 2010-08-12 10:32:39 -07:00
John Huang
edfe20c4bd am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp

* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
  Enhance WspTypeDecoder to decode Content Type Parameters
 2010-08-12 10:26:58 -07:00
Steve Block
d7bfb2dfb8 Merge "Update DeviceOrientationManager to be specific to a WebViewCore" 2010-08-12 06:30:31 -07:00
Dianne Hackborn
6fca3e68d3 Merge "Fix back popping the back stack too much." 2010-08-11 22:40:53 -07:00
Dianne Hackborn
2cceaaae34 Fix back popping the back stack too much. 
Change-Id: I18a3d0f3546e51411771d49a68a97108e00b1cea
 2010-08-11 22:32:15 -07:00
Adam Powell
65d79fbe55 Fix bug 2911396 - documentation fix 
Change-Id: Ia2bbb25dfd6b165f044f5ef1cf291debfe79b1ca
 2010-08-11 22:05:46 -07:00
Adam Powell
7f933daea9 Merge "Fix bug 2911311 and bug 2911700" 2010-08-11 21:59:54 -07:00
Adam Powell
f6148c53f9 Fix bug 2911311 and bug 2911700 
Integrate the action bar overflow menu better with the options menu lifecycle.

Change-Id: I1e3fdba04b01718c3ee3367f92e5dabe7bc84b5c
 2010-08-11 21:56:27 -07:00
Romain Guy
831cffa572 Merge "Bunch of fixes." 2010-08-11 19:38:40 -07:00
Romain Guy
959c91f7f7 Bunch of fixes. 
Fixes memory leak, fixes multiple context support, fix 3d transforms.

Change-Id: I7462cfbc57857dbd4de4e76b9d4cba58a1bce77b
 2010-08-11 19:35:53 -07:00
Chet Haase
949dbf7629 Fix the build from two breaking changes (update to current.xml and ViewRoot import) 
Change-Id: I987b12f7c5fdd4137faa55405fce99bd6f73fc71
 2010-08-11 18:41:06 -07:00
Adam Powell
0df8bfed3c Merge "Fix bug 2911529" 2010-08-11 18:24:47 -07:00
Adam Powell
3d3da27ab3 Fix bug 2911529 
Change-Id: I18d7f5d8a300bbc73ef721c5d4deb200d6a490b8
 2010-08-11 18:07:31 -07:00
Jeff Brown
b8244f4705 Merge "resolved conflicts for merge of 4e14159a to master" 2010-08-11 18:05:04 -07:00
Jeff Brown
08965fc730 resolved conflicts for merge of 4e14159a to master 
Change-Id: I42dc1efc2218af326a826aeb16daded71722b363
 2010-08-11 18:00:34 -07:00
Chet Haase
811ed1065f Make Fragments use the new animation APIs 
Change-Id: I3e3c271234c737491b6ae37821f16434f4563b1d
 2010-08-11 17:54:24 -07:00
Jeff Brown
4e14159a04 am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 
Merge commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb' into gingerbread-plus-aosp

* commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb':
  Fix ViewRoot bug attempting to finish synthetic KeyEvents.
 2010-08-11 17:26:16 -07:00
Adam Powell
943fbb4f40 Merge "ActionBar overlay mode, height fetching, show/hide" 2010-08-11 17:26:10 -07:00
Jeff Brown
b219a83ff6 am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread 
Merge commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58'

* commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58':
  Add support for the PointerLocation overlay.
 2010-08-11 16:22:47 -07:00
Jeff Brown
f66f8a58cc am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread 
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp

* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
  Add support for the PointerLocation overlay.
 2010-08-11 16:18:36 -07:00
Jeff Brown
92ff1dd835 Fix ViewRoot bug attempting to finish synthetic KeyEvents. 
Bug: 2834068
Change-Id: I34ee0c4479cee36b25a2c3e1cdf5d761b663ac1e
 2010-08-11 16:18:13 -07:00
Adam Powell
6b336f835d ActionBar overlay mode, height fetching, show/hide 
Change-Id: Ie931ed26ec885d891d6733132b517a53d95f8491
 2010-08-11 16:17:57 -07:00
Jeff Brown
95af0c14a6 Merge "Add support for the PointerLocation overlay." into gingerbread 2010-08-11 16:15:48 -07:00
Freeman Ng
da4c35b951 Merge "add a Skip option" 2010-08-11 15:48:18 -07:00
Freeman Ng
09dbf18440 add a Skip option 
Change-Id: I21dca8feb1dedc362350c41e95a12463e6e4bc61
 2010-08-11 15:45:01 -07:00
Jeff Brown
a41ca77fab Add support for the PointerLocation overlay. 
This change involves adding a new method to IWindowManager,
monitorInput() that returns an InputChannel to receive a copy of all
input that is dispatched to applications.  The caller must have
the READ_INPUT_STATE permission to make this request (similar to
other window manager methods such as getKeycodeState).

Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
 2010-08-11 14:46:32 -07:00
Kenny Root
bf0cb26a1c am f5ee5358: am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread 
Merge commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798'

* commit 'f5ee5358c187107b2e5a1e1fbcb5a648d793c798':
  Move OBB file reading to DefaultContainerService
 2010-08-11 14:15:10 -07:00
Kenny Root
f5ee5358c1 am ac9717ab: Merge "Move OBB file reading to DefaultContainerService" into gingerbread 
Merge commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e' into gingerbread-plus-aosp

* commit 'ac9717ab73afe0123b6dbb63c4dd2fc88143e53e':
  Move OBB file reading to DefaultContainerService
 2010-08-11 14:10:18 -07:00
Gilles Debunne
8584909e7f New assets for checkboxes and radio buttons. 
Added a dark/light variation.

Other files that might also need an update:
  btn_check_label_background_light.9.png
  btn_radio_label_background_light.9.png
  btn_check_label_background.9.png
  btn_radio_label_background.9.png

Pressed state is nearly invisible in light theme. To be tested with new background color.

Change-Id: Ibd312044364e08f1e789830ddd4c3af5cef30be1
 2010-08-11 11:25:39 -07:00
Kenny Root
a02b8b05dd Move OBB file reading to DefaultContainerService 
The system_server shouldn't touch files on the SD card. This change
moves the things that touch the SD card out to the
DefaultContainerService so that it will get killed if the SD card goes
away instead of the system_server.

Change-Id: I0aefa085be4b194768527195532ee6dddc801cfc
 2010-08-11 11:20:53 -07:00
Daniel Sandler
90d8610a68 Merge "Apparently people want to know what time it is." 2010-08-11 08:47:44 -07:00
Daniel Sandler
6327b957e0 Apparently people want to know what time it is. 
Bug: 2897410
Change-Id: I8a9a995cf50d197f1f8894455372d0e325eb3eae
 2010-08-11 11:45:22 -04:00
Irfan Sheriff
9f3c5da382 Merge "Split WifiStateMachine from WifiStateTracker" 2010-08-11 07:53:51 -07:00
Patrick Scott
4668e77265 am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8'

* commit 'dc1f08586eadc3a3dbbdf22b520ba1065b2032f8':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:21:25 -07:00
Patrick Scott
dc1f08586e am 9902196f: Fix npe in getCacheTotalSize. 
Merge commit '9902196f9885d369e37cf44084e3f04513511ab0' into gingerbread-plus-aosp

* commit '9902196f9885d369e37cf44084e3f04513511ab0':
  Fix npe in getCacheTotalSize.
 2010-08-11 07:18:27 -07:00
Patrick Scott
9902196f98 Fix npe in getCacheTotalSize. 
Bug: 2882277
Change-Id: I9319a48e0ed75561d3d04691fb288f69d11edc84
 2010-08-11 09:48:43 -04:00
Steve Block
f4a705f045 Update DeviceOrientationManager to be specific to a WebViewCore 
This avoids the need to pass the WebViewCore to its methods.

Change-Id: Ieec414f0819f06c8f5568ae5d6dd81a48d05fd6e
 2010-08-11 13:14:43 +01:00
Dianne Hackborn
7b6d0d99b6 am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit '679ac09a5c22175354f3a04b28456b323839530e'

* commit '679ac09a5c22175354f3a04b28456b323839530e':
  More native work.
 2010-08-11 00:50:56 -07:00
Dianne Hackborn
679ac09a5c am a5ae50cd: Merge "More native work." into gingerbread 
Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp

* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
  More native work.
 2010-08-11 00:47:51 -07:00
Dianne Hackborn
08d5b8fad8 More native work. 
Implement save/restore of state, and add native APIs for
configuration information.

Change-Id: I2a3ddc2ba605db58d7c8b2b31b9215fb323f90b5
 2010-08-11 00:29:59 -07:00
Konstantin Lopyrev
12fb5a3573 am 8279c754: am 91a7f5fe: Making sure that the prefix is handled properly. 
Merge commit '8279c754d176d5c2aa23f6f7ad16fcea03278788'

* commit '8279c754d176d5c2aa23f6f7ad16fcea03278788':
  Making sure that the prefix is handled properly.
 2010-08-10 21:53:49 -07:00
Adam Powell
f98d3e3047 am e8fa85d7: am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread 
Merge commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085'

* commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
 2010-08-10 21:53:40 -07:00
Konstantin Lopyrev
ea5282cf90 Merge "resolved conflicts for merge of f00ee0f7 to master" 2010-08-10 21:49:04 -07:00
Konstantin Lopyrev
ecb1d5ded9 resolved conflicts for merge of f00ee0f7 to master 
Change-Id: I13b968bde37fad8fffdaa9bb94a0f1da9b2e6e0c
 2010-08-10 21:47:34 -07:00
Romain Guy
9e187ed821 Merge "Add extra blending modes." 2010-08-10 21:43:09 -07:00
Romain Guy
48daa54d31 Add extra blending modes. 
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten

Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
 2010-08-10 21:42:40 -07:00