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

25523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
0ebd5690b8 Fix 32&24 ->16 bit bitmap uploads. 
Change-Id: If8c52dd8ff34393c2908516e702a2d5daeb7bbb3
 2010-06-22 17:45:34 -07:00
Jason Sams
7c1f4c38a2 Re-enable optimization for detecting nop state changes in fragment 
and vertex programs.

Change-Id: Ic5b9ecf564d121d7a00a1eed92afb4c4783ce8bc
 2010-06-22 17:22:13 -07:00
Grace Kloba
ef7fa7bc66 Merge "Add a WebSettings to control whether WebView will use some perf trick, e.g. pause updating the picture, during panning and zooming transition." 2010-06-22 10:39:18 -07:00
Ben Murdoch
ac68873bf5 Merge "Web runtime - link following with simple SOP check - back button - fullscreen (title shown as toast for now)" 2010-06-22 05:45:43 -07:00
Romain Guy
102fb89b9a Merge "Add glOrtho equivalent to the OpenGL ES 2.0 renderer." 2010-06-21 19:36:59 -07:00
Romain Guy
08ae317c21 Add glOrtho equivalent to the OpenGL ES 2.0 renderer. 
Change-Id: I063dad3d81dab7833acb1e7a9c7121f8efd2a044
 2010-06-21 19:35:50 -07:00
Grace Kloba
f9b731d383 Add a WebSettings to control whether WebView will 
use some perf trick, e.g. pause updating the picture,
during panning and zooming transition.

Fix http://b/issue?id=2784020
 2010-06-21 19:23:57 -07:00
Jason Sams
04da2c2d7b Merge "Fix build error." 2010-06-21 18:33:17 -07:00
Jason Sams
9e2b0c505a Fix build error. 
Change-Id: Ife0ec056c33654a56f270a5673f614820cfc2e29
 2010-06-21 18:30:02 -07:00
Jason Sams
bbad09d69a Merge "Move ImageProcessing and ModelViewer to reflected files. Implement boolean support." 2010-06-21 17:45:57 -07:00
Jason Sams
9856f2de68 Merge "Remove the obsolete film example." 2010-06-21 17:44:35 -07:00
Jason Sams
a43e7613b8 Merge "Fountain example cleanup. Remove compatability versions of rsg functions that took old 'i' types." 2010-06-21 17:44:25 -07:00
Jason Sams
f110d4b787 Move ImageProcessing and ModelViewer to reflected files. 
Implement boolean support.

Change-Id: Iac2dc28067ac430b3e413fc651dfaa0b96214e2e
 2010-06-21 17:42:41 -07:00
Gilles Debunne
57f4e5bcf5 Fixed scrolling issue when moving cursor in long TextViews. 
Previous CL https://android-git.corp.google.com/g/55138 was submitted
before the suggested change was uploaded.

setSelection() was called twice by onTouchEvent, once to the previous
position, and then to the new position (unless the IME got displayed,
so that in that case the cursor is not moved).

The second call was actually triggering a call for a scroll of 0 since
the view is already displaying the cursor. This scroll is filtered out by a
shortcut in ScrollView. The first setSelection's scroll does not have
the same issue (since the previous cursor's position is out of screen
and requires a scroll) and it is then applied, effectively moving the cursor
to a new position but scrolling to the previous position.

The fix is to call setSelection only once, after the IME has been asked
to display. The cursor is moved to the old/new position depending on the
resultCode in onReceiveResult in CommitSelectionReceiver.

Bug: http://b/issue?id=2778954
Change-Id: I157d7ae451574e8a6fffb894eb1d6880acfe01d1
 2010-06-21 17:34:58 -07:00
Gilles Debunne
f4362e478a Merge "Fixed scrolling issue when moving cursor in long TextViews." 2010-06-21 16:56:15 -07:00
Daniel Lehmann
cb1f6074a3 Merge "Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on" 2010-06-21 16:36:58 -07:00
Adam Powell
fb00b2b1e8 Merge "Changes for bluetooth keyboard support." 2010-06-21 16:36:57 -07:00
Daniel Lehmann
2c63fe44f4 Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on 
Change-Id: I1d3646f2744e01a1e64db8787b4cd7dd746d540e
 2010-06-21 16:27:49 -07:00
Adam Powell
df7627db71 Changes for bluetooth keyboard support. 
Add device class constant for PROFILE_HID and check for
Device.Major.PERIPHERAL when checking for class matches.

Change UUID for HID support.

Fix bug in BluetoothService.

Change-Id: Ie5361257d90fd749249e915824564bc3d79fb95d
 2010-06-21 16:23:42 -07:00
Gilles Debunne
bbb5d6e256 Fixed scrolling issue when moving cursor in long TextViews. 
setSelection() was called twice by onTouchEvent, once to the previous
position, and then to the new position (unless the IME got displayed,
so that in that case the cursor is not moved).

The second call was actually triggering a call for a scroll of 0 since
view is already displaying the cursor. This scroll is filtered out by a
shortcut in ScrollView. The first setSelection's scroll does not have
the same issue (since the previous cursor's position is out of screen
and requires a scroll) and it then applied, effectively moving the cursor
to a new position but the scrolling to the previous position.

The fix is to call setSelection only once, after the IME has been asked
to display. The cursor is moved to the old/new position depending on the
resultCode in onReceiveResult in CommitSelectionReceiver.

Bug: http://b/issue?id=2778954
Change-Id: I0983fdf18993e63b230e093e703f95efe6e2d7a8
 2010-06-21 16:22:07 -07:00
Robert Greenwalt
8a380d1bd0 Merge "Don't modify a list while iterating." 2010-06-21 15:32:43 -07:00
Jason Sams
3ac8da87bb Remove the obsolete film example. 
Change-Id: Ifb6b991276a3a7e95f75d783141b397080631e63
 2010-06-21 15:11:15 -07:00
Jean-Baptiste Queru
a7212f555b Merge "Recover a handful of commits that were reverted earlier" 2010-06-21 14:29:47 -07:00
Robert Greenwalt
cacb2cf72c Merge "Reorder ThrottleService startup to avoid race." 2010-06-21 14:12:38 -07:00
Jean-Baptiste Queru
3b9f0a33a1 Recover a handful of commits that were reverted earlier 2010-06-21 13:46:59 -07:00
Vasu Nori
05dd626a95 Merge "fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f" 2010-06-21 13:18:00 -07:00
Jean-Baptiste Queru
c1996a16aa Undo previous merge 
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900
 2010-06-21 12:37:08 -07:00
Robert Greenwalt
1d15dd7d27 Don't modify a list while iterating. 
Remember who we want to remove instead.  Fixes concurrent modification
exception.

bug:2778958
Change-Id: If8827955e6a716fe39cc31fe5a092c613a6786d4
 2010-06-21 12:15:26 -07:00
Evan Millar
62f4ce67ac am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit '9afeda0519c4f4892611565d678f01d269863bb8'

* commit '9afeda0519c4f4892611565d678f01d269863bb8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:12:55 -07:00
Evan Millar
9afeda0519 am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 
Merge commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8' into gingerbread-plus-aosp

* commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8':
  Manual merge of change 53051 from master (DO NOT MERGE)
 2010-06-21 12:10:55 -07:00
Evan Millar
e47e3f3855 Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 2010-06-21 12:09:40 -07:00
Jean-Baptiste Queru
a6fa26f83f resolved conflicts for merge of 6c9a3004 to master 
Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95
 2010-06-21 11:44:49 -07:00
Kenny Root
9a76eb568d am 0fcfa0a5: am f25c560d: am 30cf330f: Import revised translations 
Merge commit '0fcfa0a53f92f32d50870c246763da30a106d13a'

* commit '0fcfa0a53f92f32d50870c246763da30a106d13a':
  Import revised translations
 2010-06-21 11:37:10 -07:00
Andrew Stadler
359cf08fb6 Merge "Add getWrappedCursor, and update the JavaDoc." 2010-06-21 11:35:51 -07:00
The Android Open Source Project
6c9a30045b merge from froyo-plus-aosp 
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
 2010-06-21 11:23:45 -07:00
Kenny Root
0fcfa0a53f am f25c560d: am 30cf330f: Import revised translations 
Merge commit 'f25c560dcdc0c04e11152fff11f521dae03522cd' into gingerbread-plus-aosp

* commit 'f25c560dcdc0c04e11152fff11f521dae03522cd':
  Import revised translations
 2010-06-21 11:20:28 -07:00
Kenny Root
f25c560dcd am 30cf330f: Import revised translations 
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
 2010-06-21 11:17:07 -07:00
Kenny Root
30cf330fae Import revised translations 
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
 2010-06-21 11:03:50 -07:00
Vasu Nori
8208529cd7 Merge "journal_mode should be set only on non-memory databases" 2010-06-21 10:46:29 -07:00
Vasu Nori
194897da94 journal_mode should be set only on non-memory databases 
setting journal_mode to TRUNCATE on memory databases causes an error message
to be displayed by SQLIteDatabase.

Change-Id: Ie8b8ae22cb9fba99cee59dba35b260195c63eadc
 2010-06-21 10:41:14 -07:00
Andrew Stadler
46baf533f5 Add getWrappedCursor, and update the JavaDoc. 
Change-Id: I7d0513056b4d83b457374d783465fe848b7e530c
 2010-06-21 10:23:52 -07:00
Kenny Root
ab8aa51aa6 am b2ce04c2: am cfe3d205: am c4e38577: Import revised translations 
Merge commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de'

* commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de':
  Import revised translations
 2010-06-21 10:16:48 -07:00
Chia-chi Yeh
f23729a0e3 am d9e9132e: am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d'

* commit 'd9e9132eeb2c02feb812f21a5cecb844b5b39d9d':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 10:16:45 -07:00
Shimeng (Simon) Wang
fedffeedb4 Merge "Add dumpChildFramesAsText function support in LayoutTestController." 2010-06-21 10:07:35 -07:00
Shimeng (Simon) Wang
ad45686d72 Add dumpChildFramesAsText function support in LayoutTestController. 
Change-Id: I8af0bbca1d2166a25486d5a12fb6a985bbe264ef
 2010-06-21 10:05:34 -07:00
Brad Fitzpatrick
9e2b41ca20 am 65ff03a1: am 04b243d0: Fix NPE during ANRs. 
Merge commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0'

* commit '65ff03a1fc56cd272529d1423ddef8e383cad7c0':
  Fix NPE during ANRs.
 2010-06-21 09:54:24 -07:00
Kenny Root
b2ce04c2ea am cfe3d205: am c4e38577: Import revised translations 
Merge commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b' into gingerbread-plus-aosp

* commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b':
  Import revised translations
 2010-06-21 09:08:51 -07:00
Chia-chi Yeh
d9e9132eeb am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount(). 
Merge commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33' into gingerbread-plus-aosp

* commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33':
  media: add AudioTrack::getMinFrameCount().
 2010-06-21 09:08:16 -07:00
Brad Fitzpatrick
65ff03a1fc am 04b243d0: Fix NPE during ANRs. 
Merge commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c' into gingerbread-plus-aosp

* commit '04b243d0f5470cfaf67cce5534f9a9fb2e30855c':
  Fix NPE during ANRs.
 2010-06-21 09:05:16 -07:00
Kenny Root
cfe3d205b0 am c4e38577: Import revised translations 
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
 2010-06-21 09:02:13 -07:00