Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,466 Commits 3 Branches 0 Tags
3a70b20ee5aa2c0d451f1d2a5701bf9c43c8ca6f
Commit Graph

26466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
3a70b20ee5 Merge "New cursor controller in TextViews." 2010-07-09 16:22:30 -07:00
Gilles Debunne
cc3ec6cdb2 New cursor controller in TextViews. 
Editable TextView now display a cursor controller under the insertion
point so that it can be precisely moved.

Change-Id: Ia2e6ddc57d249647ff6683e10e4226db3df27223
 2010-07-09 16:20:21 -07:00
Romain Guy
4670268f47 Merge "Fix alpha blending and improve fragment shaders performance." 2010-07-09 16:15:35 -07:00
Romain Guy
16202fc974 Fix alpha blending and improve fragment shaders performance. 
Change-Id: Ib74f6941d25ca6f6a41708e541174eaa7e8d9bc2
 2010-07-09 16:13:28 -07:00
The Android Open Source Project
b92cd4fc63 am 0260887c: merge from open-source master 
Merge commit '0260887ca78330b8dd7009d91859925df94a69d6'

* commit '0260887ca78330b8dd7009d91859925df94a69d6':
  Improved logging when there's an error creating the directories in getFilesDir()
 2010-07-09 16:01:00 -07:00
The Android Open Source Project
0260887ca7 merge from open-source master 
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
 2010-07-09 15:59:17 -07:00
The Android Open Source Project
ba7a36e1c5 am 990d9ca4: merge from open-source master 
Merge commit '990d9ca416d1410130333b7b461162c953a1f0c2'

* commit '990d9ca416d1410130333b7b461162c953a1f0c2':
  update 404'd source.android.com URLs
 2010-07-09 15:58:45 -07:00
The Android Open Source Project
990d9ca416 merge from open-source master 
Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3
 2010-07-09 15:56:45 -07:00
The Android Open Source Project
dc037882a7 am 3dbbf2dc: ignore from open-source master 
Merge commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270'

* commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270':
  Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently
 2010-07-09 15:53:17 -07:00
The Android Open Source Project
3dbbf2dc21 ignore from open-source master 
Change-Id: I8f474f33c225416242421db0ff6c08267d4ce002
 2010-07-09 15:50:11 -07:00
Jason Sams
2caad1dcec Merge "Remove points from fixed function. Add basic GL performance test." 2010-07-09 15:35:09 -07:00
Jason Sams
53a93d5e91 Remove points from fixed function. 
Add basic GL performance test.

Change-Id: I421a41b6683b2c5f70045cdd0f610a6939105fee
 2010-07-09 15:34:32 -07:00
David Brown
a6935ab009 am d321e8d6: am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread 
Merge commit 'd321e8d6882485203b159b224d49247707bdd5aa'

* commit 'd321e8d6882485203b159b224d49247707bdd5aa':
  Remove some (unused, non-public) phone-related status bar notification icons
 2010-07-09 14:13:00 -07:00
Jean-Baptiste Queru
eb678fb63d Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
Romain Guy
82164ad543 Merge "Refactoring to move vertex computing to the Patch class." 2010-07-09 13:55:35 -07:00
Romain Guy
fb5e23c327 Refactoring to move vertex computing to the Patch class. 
This change is mostly cleanup to keep less code in OpenGLRenderer.

Change-Id: I954375143b2943829457ab470423729b60b844f5
 2010-07-09 13:52:56 -07:00
Vasu Nori
187c7216d6 Merge "reduce locking when using SQLiteStatement" 2010-07-09 13:37:45 -07:00
Romain Guy
3465d5f532 Merge "Avoid unnecessary tests when drawing ListView dividers." 2010-07-09 13:29:00 -07:00
Romain Guy
bbefa2360b Merge "Optimize blending state changes." 2010-07-09 13:28:06 -07:00
Romain Guy
179de8a37c Avoid unnecessary tests when drawing ListView dividers. 
Change-Id: I5f2797ee92f5e3ed01eab0cf7f2acfe436b0c595
 2010-07-09 13:27:00 -07:00
Romain Guy
82ba814ca0 Optimize blending state changes. 
Change-Id: I7c22a8aecccb8b5abfcf7243f049a4ef3cf3979a
 2010-07-09 13:25:56 -07:00
David Brown
d321e8d688 am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread 
Merge commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a' into gingerbread-plus-aosp

* commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a':
  Remove some (unused, non-public) phone-related status bar notification icons
 2010-07-09 13:00:00 -07:00
David Brown
2aaa9e9fc5 Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread 2010-07-09 12:57:39 -07:00
Jean-Michel Trivi
90787e053a am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 
Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'

* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
  Fix swap of sessionId and output in audio effect API.
 2010-07-09 12:34:03 -07:00
Jean-Michel Trivi
bd3f8b7116 am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp

* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
  Fix swap of sessionId and output in audio effect API.
 2010-07-09 12:32:21 -07:00
Vasu Nori
e25539fdfd reduce locking when using SQLiteStatement 
Do compiling of sql, binding of args and execution of the SQL
statement within one single database lock period.
This reduces the number of times the database lock
needs to be acquired during the course of compilation, binding
and execution of a SQLiteStatement.

Change-Id: I22b090ec9e10fc0aa2532a93bafe610af2546b58
 2010-07-09 12:31:12 -07:00
Jean-Michel Trivi
e7b790f1f7 Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 2010-07-09 12:30:28 -07:00
Jean-Michel Trivi
4cb15cf15d Fix swap of sessionId and output in audio effect API. 
Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
 2010-07-09 12:11:49 -07:00
James Dong
020057bd53 am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 
Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'

* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
  Enable the support for decoding audio with AAC+ and eAAC+ features
 2010-07-09 11:43:59 -07:00
James Dong
a60337ce57 am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 
Merge commit '6bb14e08da82e72197f35548ff77a2f817c52a58' into gingerbread-plus-aosp

* commit '6bb14e08da82e72197f35548ff77a2f817c52a58':
  Enable the support for decoding audio with AAC+ and eAAC+ features
 2010-07-09 11:41:08 -07:00
James Dong
6bb14e08da Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 2010-07-09 11:38:45 -07:00
Romain Guy
20030a6303 Merge "Remove support for density compatibility in the hardware renderer." 2010-07-09 10:39:32 -07:00
Romain Guy
dbd77cd444 Remove support for density compatibility in the hardware renderer. 
Change-Id: I535e919986e5ccfb344ede8516ccd84c02642823
 2010-07-09 10:36:05 -07:00
Grace Kloba
0fb624259e Merge "Combine base PictureSet with composite layers into one SkLayer tree to get ready for GL rendering." 2010-07-09 10:05:34 -07:00
Daniel Sandler
dce7cf9831 am 339716e0: am f99e27da: Merge "Make android:immersive public." into gingerbread 
Merge commit '339716e03c293c1ab29492e38936643f08d797fa'

* commit '339716e03c293c1ab29492e38936643f08d797fa':
  Make android:immersive public.
 2010-07-09 09:20:27 -07:00
James Dong
5fe0ae8c20 am 4f440632: am 929642ee: Add runtime dumpsys support for media recorder client 
Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04'

* commit '4f4406322dafd6e128b437edbc541327f0b38d04':
  Add runtime dumpsys support for media recorder client
 2010-07-09 09:20:03 -07:00
Mike Lockwood
d2097a9e50 Merge "Remove some scafolding and test code that is no longer worth maintaining." 2010-07-09 09:01:21 -07:00
Mike Lockwood
c5c7853b63 Remove some scafolding and test code that is no longer worth maintaining. 
Change-Id: I9ee62d2463d8df1246a84774e8ac7e674778279a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-09 11:07:55 -04:00
Ben Murdoch
177eb38ef5 Update the file filter in DumpRenderTree (and DumpRenderTree2) so that 
we run tests in .xhtml files.

Change-Id: I2af0bd29acef5bafa9dee9292aafc18d77a84080
 2010-07-09 16:06:40 +01:00
Steve Block
2b2fa12cd0 Merge "Update Browser useragent string to reflect WebKit merge at r62496" 2010-07-09 07:35:38 -07:00
Daniel Sandler
339716e03c am f99e27da: Merge "Make android:immersive public." into gingerbread 
Merge commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc' into gingerbread-plus-aosp

* commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc':
  Make android:immersive public.
 2010-07-09 06:10:26 -07:00
Daniel Sandler
f99e27da0b Merge "Make android:immersive public." into gingerbread 2010-07-09 06:07:51 -07:00
Maksymilian Osowski
029c62d866 Merge "A basic extension of ListActivity that allows navigating through tests and test folders." 2010-07-09 04:31:40 -07:00
Steve Block
59c76b87fd Update Browser useragent string to reflect WebKit merge at r62496 
Change-Id: I502ae0d565ef9bd4bd3746685b2452da12ec61d6
 2010-07-09 11:42:42 +01:00
Maksymilian Osowski
6fd7112e5c A basic extension of ListActivity that allows navigating through tests and test folders. 
It provides the user with the simple UI that makes it easy to chose which tests to run.

Change-Id: Ifd0c4665de73e5702b892e57f5e91f84db36b248
 2010-07-09 10:13:55 +01:00
James Dong
a7c14078af Enable the support for decoding audio with AAC+ and eAAC+ features 
bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
 2010-07-08 21:37:46 -07:00
James Dong
4f4406322d am 929642ee: Add runtime dumpsys support for media recorder client 
Merge commit '929642ee003895b6e4e85ad7e43c7c6f01b29020' into gingerbread-plus-aosp

* commit '929642ee003895b6e4e85ad7e43c7c6f01b29020':
  Add runtime dumpsys support for media recorder client
 2010-07-08 21:37:43 -07:00
James Dong
929642ee00 Add runtime dumpsys support for media recorder client 
Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
 2010-07-08 21:25:55 -07:00
Romain Guy
831e550b49 Merge "Draw n-patches using OpenGL." 2010-07-08 19:21:13 -07:00
Romain Guy
f7f93556c8 Draw n-patches using OpenGL. 
Currently only tested with title bars and buttons.

Change-Id: I8263a9281898dc0e943b1b8412827fe55639b9d6
 2010-07-08 19:19:07 -07:00