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

34706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
b619e3332d am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp

* commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-19 17:43:37 -07:00
Mindy Pereira
6fbc5d9c19 DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Fixes b/3111778 overscroll glitch in news & weather

Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
 2010-10-19 17:38:24 -07:00
Patrick Dubroy
fb0547d2c0 Fix memory leak with TouchTargets not being recycled. 2010-10-19 17:36:18 -07:00
Scott Main
218bf88446 am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722' into gingerbread

* commit 'a6df4b1bfdb8de7de9b52bee4d01c65941f2d722':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-19 17:29:29 -07:00
Adam Powell
7f9b90542e Add ActionBar tab callback method onTabReselected 
onTabReselected is called if an already-selected tab is chosen again.
For many apps this will be a no-op, but some may treat it as a signal
to return to the top level of a given navigation category.

Change-Id: Ic51fbe477b979562f2d848c4070b2016b217a90f
 2010-10-19 17:18:20 -07:00
David Deephanphongs
62f2ada64f Add missing NOTICE entries. 
Add missing NOTICE block for TagSoup in general NOTICE file.
Add comment in Android.mk to help reviewers locate the NOTICE for apache-http.
Modify build rule for 'am' command to pull in the NOTICE file.

Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
 2010-10-19 16:56:02 -07:00
Scott Main
a6df4b1bfd docs: add note to froyo platform doc that not all locales are included in the sdk image 
Change-Id: Icf11a14e0db6eeff535ca51de7a664a4829a35ec
 2010-10-19 16:40:14 -07:00
Dmitri Plotnikov
99291b95b2 Merge "Adding Insert.DATA extra for new/edit contact intents." 2010-10-19 15:49:25 -07:00
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
Mathias Agopian
f91bff9fd4 fix [2236865] STOPSHIP: bump soft gl and egl minor version number 
Change-Id: Ibf46b18d7493348e189f2c93e969a6cac61f68b5
 2010-10-19 14:47:08 -07:00
Jean-Baptiste Queru
db723ea0f7 Merge "jni: Remove duplicated jniThrowException()" 2010-10-19 14:42:52 -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
Gil Dobjanschi
ce146d9dd5 Merge "Finalized the audio track ducking API" 2010-10-19 14:20:04 -07:00
Chung-yih Wang
aefcdde4bd am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService. 
Merge commit '4944fdd771d2a629b3c1af8097df5eb2de02d9ee' into gingerbread-plus-aosp

* commit '4944fdd771d2a629b3c1af8097df5eb2de02d9ee':
  Periodically scan wifi when wifi is not connected and wifi lock is
 2010-10-19 14:17:44 -07:00
Hung-ying Tyan
35d9e7701e am 0a6e717f: Handle dialing a SIP call to self. 
Merge commit '0a6e717fb6846f66b8dc853e079f2166307bfc60' into gingerbread-plus-aosp

* commit '0a6e717fb6846f66b8dc853e079f2166307bfc60':
  Handle dialing a SIP call to self.
 2010-10-19 14:14:15 -07:00
Chung-yih Wang
4944fdd771 Periodically scan wifi when wifi is not connected and wifi lock is 
grabbed in SipService.

bug: http://b/3077454
Change-Id: I153974325c29e0f927c8eb7fdbc4725aaf10087d
 2010-10-19 14:09:30 -07:00
Hung-ying Tyan
0a6e717fb6 Handle dialing a SIP call to self. 
Reply BUSY HERE response so server may redirect the call to the voice mailbox.

http://b/issue?id=3103072
http://b/issue?id=3109479

Change-Id: I81f5dd59ad87298dd9dda87084538ee460eabba8
 2010-10-19 14:00:11 -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
Chris Tate
fb2378b579 am a30c8835: (-s ours) am 18580319: DO NOT MERGE. Turn down backup logging for release. 
Merge commit 'a30c88359f62391b77874b83825a6e400c5100b3'

* commit 'a30c88359f62391b77874b83825a6e400c5100b3':
  DO NOT MERGE.  Turn down backup logging for release.
 2010-10-19 13:37:13 -07:00
Gil Dobjanschi
7bfcabbb9e Finalized the audio track ducking API 
Change-Id: I12b966c1898eaae76e9de71a6d745678dc489092
 2010-10-19 13:23:56 -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
Brad Fitzpatrick
987e8d7f97 Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread 2010-10-19 12:12:31 -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
Chris Tate
a30c88359f am 18580319: DO NOT MERGE. Turn down backup logging for release. 
Merge commit '1858031946b3627b599475c5894655362e510351' into gingerbread-plus-aosp

* commit '1858031946b3627b599475c5894655362e510351':
  DO NOT MERGE.  Turn down backup logging for release.
 2010-10-19 12:04:44 -07:00
Adam Powell
35f21fe0ff Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw 
Change-Id: Ie8d9b2c0862cc901ed9534e81465fe41ade1f9a0
 2010-10-19 11:54:10 -07:00
Romain Guy
24a7d5d053 Merge "Solve rendering issue with embedded WebViews. Bug #3094017" 2010-10-19 11:46:15 -07:00
Romain Guy
50c0f093d9 Solve rendering issue with embedded WebViews. 
Bug #3094017

The blending mode was not appropriately set after WebView released the
context.

Change-Id: Ib36d48e82c12f6d131dd5a0bcde9106925b8da63
 2010-10-19 11:42:22 -07:00
James Dong
d793f14fc9 Merge "Camera hal change for 0-memcpy in media recording framework" 2010-10-19 11:25:19 -07:00
Chris Tate
1858031946 DO NOT MERGE. Turn down backup logging for release. 
Change-Id: Ib9f4fd15981fcf52b5d5912995c1891836303427
 2010-10-19 11:22:03 -07:00
James Dong
b0a6db20bb Camera hal change for 0-memcpy in media recording framework 
o document the camera hal to clarify the reviewer's questions.

bug - 3042125

Change-Id: I3edf701d084933ee8d1e3b054d222e8c9dfc42a5
 2010-10-19 11:21:03 -07:00
Andreas Huber
e01645137e am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread 
Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'

* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
  If we encounter video stream EOS while seeking we may still need to seek audio.
 2010-10-19 11:19:55 -07:00
Kenny Root
1072b7f751 am c0e97872: am 928b0748: Merge "Don\'t symlink native library paths for old apps" into gingerbread 
Merge commit 'c0e9787293b761b04bdb07908751b22458f17bbc'

* commit 'c0e9787293b761b04bdb07908751b22458f17bbc':
  Don't symlink native library paths for old apps
 2010-10-19 11:19:45 -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
Chung-yih Wang
dc58e5211f am cd6fe63f: am b4116c09: Fix the incorrect environment variable name for the thread pool size. 
Merge commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2'

* commit 'cd6fe63fdc2e99da11b19a233afd81e2448d0db2':
  Fix the incorrect environment variable name for the thread pool size.
 2010-10-19 11:18:42 -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
Jean-Baptiste Queru
32343128d9 Skip 494ec19e from gingerbread-plus-aosp (already cherry-picked) 
Change-Id: I319738dccfeb0be82fed2bcc58eb425b222bc0fa
 2010-10-19 10:51:58 -07:00