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

45866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chen
5ff79c3b06 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Dianne Hackborn
9248e95a2f DO NOT MERGE Cherry-pick of Ie4026a7c back to GB 
Original change description follows:
-----------------------------------

Implement issue #3326435: Battery stats improvements

Keep track of discharge while screen is on vs. off.

Checkin looks like:

5,0,u,dc,1,1,1,0

The last four numbers are, from left:

- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.

Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
 2011-02-23 17:21:09 -08:00
James Dong
bc5f1f5c81 d263 may contain optional bitr box, and thus its size can be up to 23 bytes 
bug - 3482703

Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
 2011-02-23 17:11:41 -08:00
Michael Kolb
75a03f9a3c use getTitleHeight for measuring 
Bug: 3473996
    change getTitleHeight to be protected so that subclass
    can override it
    use getTitleHeight for rendering
    use getHeight for clipping

Change-Id: I6e9a85d88eba176886e53b260d02082d26b410d8
 2011-02-23 17:01:38 -08:00
Irfan Sheriff
5107eea64e Merge "DO NOT MERGE Add support for background scanning" into honeycomb 2011-02-23 16:59:55 -08:00
Chet Haase
a8bdc2a42e Merge "Fix bug with bad state in animators" 2011-02-23 16:59:03 -08:00
Irfan Sheriff
1e231cbf0c Merge "Remove backup of sleep policy setting" 2011-02-23 16:54:55 -08:00
Chet Haase
154f14508a Fix bug with bad state in animators 
Bug 3482310: The playing state was not being correctly set to
RUNNING after an animator was start()'d. Instead, we were seeking
to the start value (correct), setting the state to SEEKED (also correct),
but not resetting the playing state to STOPPED. So when the animation
actually started animating values, it didn't recognize that it was
starting a STOPPED animation, so it never set its state to RUNNING,
and never returned true from isRunning().

Change-Id: Iea92dce98f92f60052d8a9a451094b953f9f0c67
 2011-02-23 16:53:18 -08:00
John Reck
a6adf983d9 Merge "Add x- header to prevent url logging in incognito" 2011-02-23 16:50:24 -08:00
John Reck
ab5901dab2 Add x- header to prevent url logging in incognito 
Bug: 3336575

Change-Id: I4a65242405d731f74c676382a810f608afcaad39
 2011-02-23 16:42:10 -08:00
Mike Lockwood
55d03444ba Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence" 2011-02-23 16:40:12 -08:00
Mike Lockwood
58ec34cef5 GpsLocationProvider: Clean up HAL initialization/cleanup sequence 
Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-23 16:35:33 -08:00
Romain Guy
bcbe8b699e Merge "More documentation for Canvas.drawArc()" 2011-02-23 16:32:16 -08:00
Romain Guy
4a317db43d More documentation for Canvas.drawArc() 
Change-Id: I007a1db94306e05cf4e245f876aa1921f518c113
 2011-02-23 16:34:21 -08:00
Jason Sams
595f37c103 Merge "fix bug 3477451 Bogus asserts with pure compute scripts." 2011-02-23 16:29:41 -08:00
Kenny Root
5be2b95db6 Merge "Fix measurement of external media dir" 2011-02-23 16:27:10 -08:00
Kenny Root
c7624d9338 Fix measurement of external media dir 
Change-Id: I90a39c6a506ad0e5d18b40824d06eb1a7e376a3e
 2011-02-23 16:25:25 -08:00
Dmitri Plotnikov
dbcdbf2128 Fix javadoc for DisplayNameSources 
Bug: 3370212
Change-Id: I13d3ae96b6fcbba6d1ae8a1f06fb971de1f73f81
 2011-02-23 16:05:58 -08:00
Romain Guy
68b6b1c2d1 A bit more doc for ListAdapter#areAllItemsEnabled(). 
Change-Id: I339de99f52a8b5a3405d2aabd83a6dc92ca96e98
 2011-02-23 16:05:07 -08:00
Romain Guy
557704e22a Merge "A bit more doc for ListAdapter#areAllItemsEnabled()." 2011-02-23 16:04:07 -08:00
Scott Main
cd4ed5438c am b1eea45a: am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 
* commit 'b1eea45a71a3fffe3014bbe84226df3c57ddbafc':
  docs: fix sensorevent code snippets bug: 3480932
 2011-02-23 16:02:13 -08:00
Scott Main
b1eea45a71 am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 
* commit '201959af6e61c148576c77de6cf772456d664251':
  docs: fix sensorevent code snippets bug: 3480932
 2011-02-23 16:00:08 -08:00
Scott Main
201959af6e Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 2011-02-23 15:58:13 -08:00
Romain Guy
99f422fefd Merge "Add dither XML attribute support to Gradient and ShapeDrawable." 2011-02-23 15:57:19 -08:00
Romain Guy
ed7894352f Add dither XML attribute support to Gradient and ShapeDrawable. 
Change-Id: I4b60a0ba6766b7e7b176e78dc7f15f8467e2b890
 2011-02-23 15:57:08 -08:00
Jaikumar Ganesh
5936245654 Merge "Make BluetoothPan inherit from BluetoothProfile." 2011-02-23 15:50:57 -08:00
Jaikumar Ganesh
74ef119945 Make BluetoothPan inherit from BluetoothProfile. 
Change-Id: Ibd3e24e391be93ebe2cf975bd075efb68e10c1ff
 2011-02-23 15:49:15 -08:00
Eric Fischer
b5b75c5136 am bb0c1a36: (-s ours) am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'bb0c1a366dab54f20c8aded19ca01fe3d8721de2':
  Import revised translations.  DO NOT MERGE
 2011-02-23 15:38:38 -08:00
Eric Fischer
bb0c1a366d am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '32751e3175d8dca96d75b6c93a32557c259c13a7':
  Import revised translations.  DO NOT MERGE
 2011-02-23 15:36:08 -08:00
Eric Fischer
32751e3175 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-23 15:33:12 -08:00
Mathias Agopian
7f97c4ef12 Merge "Remove RefBase.h dependency on TextOutput.h" 2011-02-23 15:23:13 -08:00
Kristian Monsen
f0d9731313 Hiding deprecated classes and methods 
These have been deprecated for more than a yearm so hiding them.

Note that this CL was approved in honeycomb, but moved to MR1:
https://android-git.corp.google.com/g/#change,89487
 2011-02-23 23:07:42 +00:00
Xavier Ducrohet
b2c7dd5986 LayoutLib: downsize the SparseArray when possible. 
Change-Id: I570b93ab161414b7729f8d2dce8ddadb706f186b
 2011-02-23 15:02:58 -08:00
Glenn Kasten
cc562a3576 Bug 3438258 Add SurfaceTexture as MediaPlayer sink 
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.

This includes:
 - New Java and C++ interfaces
 - C++ plumbing and implementation (JNI, Binder)
 - Stagefright AwesomePlayer and NuPlayer use ANativeWindow
   (either Surface or SurfaceTextureClient)

Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
 2011-02-23 15:02:56 -08:00
Eric Fischer
fc1c800b2e Import revised translations. DO NOT MERGE 
Change-Id: I5089e17bd14de7b4e217c1b91e393ae4799c4263
 2011-02-23 14:49:04 -08:00
Jason Sams
07078e3858 fix bug 3477451 
Bogus asserts with pure compute scripts.

Change-Id: If5928c563e06405f75a11606d9148d64fa10be07
 2011-02-23 14:47:17 -08:00
Irfan Sheriff
17f49e4f91 am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 
* commit 'b0e5326d8cc661448a7ff611d02d439d4a328a3d':
  DO NOT MERGE No backup of country and sleep policy
 2011-02-23 14:41:01 -08:00
Irfan Sheriff
b0e5326d8c am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
  DO NOT MERGE No backup of country and sleep policy
 2011-02-23 14:38:10 -08:00
Irfan Sheriff
a46a5cba27 Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb 2011-02-23 14:35:20 -08:00
Scott Main
eaf997258d am 63a4f9f5: am c516c771: docs: fix md5 sums 
* commit '63a4f9f5e66e5fa38ed798c8cbcc44f623e42ec0':
  docs: fix md5 sums
 2011-02-23 14:19:48 -08:00
Scott Main
63a4f9f5e6 am c516c771: docs: fix md5 sums 
* commit 'c516c7714d9cdc996053fd2a130015cbde978242':
  docs: fix md5 sums
 2011-02-23 14:17:30 -08:00
Scott Main
c516c7714d docs: fix md5 sums 
Change-Id: Ie1cb77cf54bd17d2aa8228f73158e7589a7aebaa
 2011-02-23 14:13:50 -08:00
Gloria Wang
daabf8b5ee Merge "To collect the total usage time of encoders in the media recorder" 2011-02-23 14:12:33 -08:00
Irfan Sheriff
5e7e5ec038 Remove backup of sleep policy setting 
Remove backup and restore of sleep policy settings

Change-Id: I87821efcaca72e12d32fdeedd8349971d85bff2b
 2011-02-23 14:11:11 -08:00
Eric Hassold
d9896edfa3 Merge "Correctly handle translucency of device-specific pixel formats" 2011-02-23 14:10:04 -08:00
Jamie Gennis
acf33974b3 Expand on the SurfaceTexture API docs. 
This change adds additional documentation explaining how a
SurfaceTexture should be used in OpenGL ES.  It describes some of the
limitations of using the GL_TEXTURE_EXTERNAL_OES texture target.

Change-Id: I9d3446a012376166b6c598b827a0aa0e9585d00f
 2011-02-23 13:58:44 -08:00
Alon Albert
9add122296 DO NOT MERGE - Increasing timeout to 60 sec 
This was already done in HC branch in this CL:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1
This is also related to bug http://b/issue?id=3402863
I first considered increasing the timeout specificaly for our GData client
but when I saw we already accepted a CL for HC that did this at a lower level, I decided
to do that instead.

Bug: 3402863
Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
 2011-02-23 13:55:11 -08:00
Irfan Sheriff
ae388dac6d DO NOT MERGE No backup of country and sleep policy 
Remove country code and sleep policy setting back up as it
is a device specific setting

Bug: 3481068
Change-Id: Ifc824c1cd3c3706f8cdaf09b06a05a0c94243acb
 2011-02-23 13:51:52 -08:00
Jamie Gennis
1beb480552 am 20bfbd95: am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit '20bfbd9544dcb36f967c93a63842ecea92e82f22':
  egl: fixes for object refcounts
 2011-02-23 13:37:34 -08:00
Jamie Gennis
20bfbd9544 am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 
* commit '76d0c763f008d19791e13ebabe9ec83958354bc5':
  egl: fixes for object refcounts
 2011-02-23 13:31:12 -08:00