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

15084 Commits

Author SHA1 Message Date
Gilles Debunne
02655e5cc8 Fixing naming issue in 74927 
Change-Id: I9a921674375dcd4f6dce31c6302fa47890e2b65f
 2010-10-19 15:42:24 -07:00
Jean-Baptiste Queru
2cead908f4 am db723ea0: Merge "jni: Remove duplicated jniThrowException()" 
Merge commit 'db723ea0f70392f712542edb1114fc15e782cdb7' into gingerbread-plus-aosp

* commit 'db723ea0f70392f712542edb1114fc15e782cdb7':
  jni: Remove duplicated jniThrowException()
 2010-10-19 15:22:13 -07:00
Dianne Hackborn
8f39c64bf1 Fix activated state in holo theme. 
The background showing the activated state needs to be a
state list so it can change.  Also remove the new default
drawable in the selector that appeared, since it is redundant
with the original default of being transparent.

Change-Id: I90b23883af73da05e4b314725ef6a8e374019565
 2010-10-19 14:34:09 -07:00
Gilles Debunne
80f54ad9e8 Merge "Renamed drawable-xlarge to drawable-mdpi-xlarge." 2010-10-19 14:27:13 -07:00
Chris Tate
a949d7d881 Merge "Introduce an OnDragListener mechanism" 2010-10-19 13:58:07 -07:00
Chris Tate
32affef4f8 Introduce an OnDragListener mechanism 
If the listener's onDrag(view, event) returns 'false', the view's own
onDragEvent() will be called.  If the listener returns 'true', it
consumes the event (and declares that it will handle the rest of the
drag event sequence, in the case of DRAG_STARTED actions).

Change-Id: I01aff0e4f59f71e55f5eea1049905c80714f0607
 2010-10-19 13:56:17 -07:00
Brad Fitzpatrick
6be063d8a9 am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'

* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 13:38:00 -07:00
Leon Scroggins
4f4a567217 Tell nativeFindAll whether the new search matches the last one. 
Bug:3108852

Requires a change in external/webkit.

Change-Id: I4333532b4febfa9e832272cf903c3f96ebff0203
 2010-10-19 15:56:56 -04:00
Leon Scroggins
6b38e5cd05 Use primary color for matches string. 
Bug:3111419
Change-Id: I9cd159ad836c42ca5f3f9aa81db6a82c5362957e
 2010-10-19 15:48:54 -04:00
Brad Fitzpatrick
6799864d6c am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 
Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp

* commit '59993d9bc589089e6be55371c6536a42afe21a64':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
 2010-10-19 12:44:19 -07:00
Brad Fitzpatrick
59993d9bc5 Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread 2010-10-19 12:40:53 -07:00
Joe Onorato
368fdba47a am bdf1706a: Merge "Reduce logging." into gingerbread 
Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
  Reduce logging.
 2010-10-19 12:29:43 -07:00
Brad Fitzpatrick
5a67749a35 am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 
Merge commit '987e8d7f9748018d3fee5778645b267a9ee06ff6' into gingerbread-plus-aosp

* commit '987e8d7f9748018d3fee5778645b267a9ee06ff6':
  Fix Vibrator permission CTS test broken earlier.
 2010-10-19 12:25:46 -07:00
Amith Yamasani
5931b1f415 Fix layout issues, add a maxWidth attribute to SearchView. 
Bug: 3067611
Bug: 3067595
 2010-10-19 12:24:27 -07:00
Joe Onorato
bdf1706ac6 Merge "Reduce logging." into gingerbread 2010-10-19 12:23:51 -07:00
Brad Fitzpatrick
44d2c69ad3 Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX 
Bug: 3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
 2010-10-19 12:19:41 -07:00
Joe Onorato
431bb22695 Reduce logging. 
Remember, the system and main logs are
    - Shared resources
    - Primarily for recording problems
    - To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
 2010-10-19 15:08:05 -04:00
Adam Powell
067222d11f Merge "Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw" 2010-10-19 12:04:49 -07:00
Adam Powell
35f21fe0ff Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw 
Change-Id: Ie8d9b2c0862cc901ed9534e81465fe41ade1f9a0
 2010-10-19 11:54:10 -07:00
Wu-cheng Li
4b3370a31c am 9bf511db: am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread 
Merge commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188'

* commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188':
  Fix some camera orientation javadoc errors.
 2010-10-19 11:19:15 -07:00
Sylvain Fonteneau
ca2a75ad56 am 824de4b3: am dd7341f7: Added missing implementation for NdefRecord. 
Merge commit '824de4b3e378a5ef41de1704ee3f50a49d408a66'

* commit '824de4b3e378a5ef41de1704ee3f50a49d408a66':
  Added missing implementation for NdefRecord.
 2010-10-19 11:17:52 -07:00
Brad Fitzpatrick
26e9cf38b2 Fix Vibrator permission CTS test broken earlier. 
Bug: 3106964
Change-Id: I76138780ac64f761fe09ef8ba74382c7ee05d794
 2010-10-19 11:02:20 -07:00
Brad Fitzpatrick
49889d4ffc am c9cff071: am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 
Merge commit 'c9cff071af175e559339c54876136612ac5eda3b'

* commit 'c9cff071af175e559339c54876136612ac5eda3b':
  StrictMode: fix docs to actually compile and add a utility method.
 2010-10-19 10:44:52 -07:00
Shimeng (Simon) Wang
b0f67c9d06 am b65058a4: am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread 
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'

* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
  Don't force ended when full screen video is returned manually.
 2010-10-19 10:44:46 -07:00
Gilles Debunne
949ca1c67c Renamed drawable-xlarge to drawable-mdpi-xlarge. 
Change-Id: I27e39ba31ef653e651d87ae8409faacacf4e7ceb
 2010-10-19 10:23:14 -07:00
Nick Pelly
29d9849fd7 am 7dced8de: am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread 
Merge commit '7dced8de3813aa42edb59e13e3ea3a2657d06125'

* commit '7dced8de3813aa42edb59e13e3ea3a2657d06125':
  NFC: broadcast intent constants for adapter state change
 2010-10-19 09:56:01 -07:00
Nick Pelly
5bc8c853f5 am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread 
Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8'

* commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8':
  Prevent use of NFC api if device is not featurized for NFC.
 2010-10-19 09:53:03 -07:00
Wu-cheng Li
9bf511db85 am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread 
Merge commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f' into gingerbread-plus-aosp

* commit 'f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f':
  Fix some camera orientation javadoc errors.
 2010-10-19 08:44:13 -07:00
Dianne Hackborn
4fa1a221b4 Remove public resource padding. 
Change-Id: Id4f28ecfb7a87267c256571ed5f98652730b44fc
 2010-10-19 08:16:49 -07:00
Wu-cheng Li
2fe6fcaff4 Fix some camera orientation javadoc errors. 
bug:3105659
Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
 2010-10-19 19:14:04 +08:00
Dmitri Plotnikov
bb54929f76 Adding Insert.DATA extra for new/edit contact intents. 
This is a way to supply any amount of arbitrary initial
values for the newly created contacts or additional
data for an existing contact.

Change-Id: Iec050cf9177be2ffb115e473dcd43ef37e5bbd5e
 2010-10-18 20:37:02 -07:00
Sylvain Fonteneau
824de4b3e3 am dd7341f7: Added missing implementation for NdefRecord. 
Merge commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d' into gingerbread-plus-aosp

* commit 'dd7341f775ca4d86091f4106d6dfef9214073a7d':
  Added missing implementation for NdefRecord.
 2010-10-18 19:13:29 -07:00
Sylvain Fonteneau
dd7341f775 Added missing implementation for NdefRecord. 
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml

Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
 2010-10-18 19:09:26 -07:00
Adam Powell
8e5992ad66 Merge "New dialog assets. Cancelable AlertDialogs may now be canceled by tapping outside." 2010-10-18 19:01:44 -07:00
Adam Powell
fc94ddef2f New dialog assets. Cancelable AlertDialogs may now be canceled by tapping outside. 
Change-Id: I061f09bd79a5f2b627fb0f01aba36f37449b849d
 2010-10-18 18:57:11 -07:00
Dianne Hackborn
69a19fdbff am 3d2818d3: Remove public resource padding. 
Merge commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8' into gingerbread-plus-aosp

* commit '3d2818d34feab5a62dfb33452f99f2d3ca667cc8':
  Remove public resource padding.
 2010-10-18 18:41:12 -07:00
Dianne Hackborn
3d2818d34f Remove public resource padding. 
Change-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780
 2010-10-18 18:20:02 -07:00
Adam Cohen
187f1a951b Merge "Cleaned up the way StackView draws outside of its bounds" 2010-10-18 17:30:46 -07:00
Adam Cohen
d51bbb5b56 Cleaned up the way StackView draws outside of its bounds 
Change-Id: I2a0e8d970434fbaf13b2f82c5d3b3dcbdc2488b5
 2010-10-18 17:24:53 -07:00
Gilles Debunne
b82213d54b resolved conflicts for merge of 6775754a to master 
Change-Id: Ib03417aa3f13839b7fdf24f7d66b2d449589d41e
 2010-10-18 17:19:57 -07:00
Brad Fitzpatrick
c9cff071af am b4157a43: Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 
Merge commit 'b4157a432cf791906d5b2f6d187f1767357a51bb' into gingerbread-plus-aosp

* commit 'b4157a432cf791906d5b2f6d187f1767357a51bb':
  StrictMode: fix docs to actually compile and add a utility method.
 2010-10-18 17:04:55 -07:00
Shimeng (Simon) Wang
b65058a455 am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread 
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp

* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
  Don't force ended when full screen video is returned manually.
 2010-10-18 17:04:47 -07:00
Brad Fitzpatrick
b4157a432c Merge "StrictMode: fix docs to actually compile and add a utility method." into gingerbread 2010-10-18 16:46:03 -07:00
Nick Pelly
54770496d3 am 6b09a90a: am e47150e9: Fix up NFC permissions. 
Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e'

* commit '6b09a90a818137de52a0c7325339849ccf584b9e':
  Fix up NFC permissions.
 2010-10-18 16:42:18 -07:00
Shimeng (Simon) Wang
6b2274a11b Merge "Don't force ended when full screen video is returned manually." into gingerbread 2010-10-18 16:40:25 -07:00
Nick Pelly
c5469bd67a am 774b943f: am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc. 
Merge commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65'

* commit '774b943fc6baa7d3e2880382d4dc7ab085d54b65':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.
 2010-10-18 16:39:30 -07:00
Sylvain Fonteneau
57b757c4b3 am 73cd4fff: am a926540d: Implement methods introduced in draft #5 NFC API. 
Merge commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b'

* commit '73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b':
  Implement methods introduced in draft #5 NFC API.
 2010-10-18 16:38:50 -07:00
Brad Fitzpatrick
62a1eb58bf StrictMode: fix docs to actually compile and add a utility method. 
Yes, this is a last minute public API change, but I'm already getting
a lot of inquiries about how to use StrictMode on a GB device but
targetting Eclair or Froyo.  I'd like a simple answer involving
reflection, but the current API is too painful to use via reflection.

I imagine this will be a common request, and it's much easier for us
to write a little blog post about trying it out if there's an easy way
to use it with reflection.

Change-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1
 2010-10-18 16:36:39 -07:00
Shimeng (Simon) Wang
43aaa2dd3f Don't force ended when full screen video is returned manually. 
issue: 3102273
Change-Id: Id9983a229e103dd255b280638979712873117d10
 2010-10-18 16:25:59 -07:00
Jaikumar Ganesh
96eeb7e1ad Merge "Fix race condition between starting of service and getting the Profile Proxy." 2010-10-18 15:59:55 -07:00