36131 Commits

Author SHA1 Message Date
Adam Cohen
176116aa60 Merge "-Prevent StackView from advancing while interacting with it -Fixed null pointer exception Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297" 2010-11-12 11:38:35 -08:00
Leon Scroggins
393352608e Merge "Provide variable for debugging the text in WebTextView." 2010-11-12 11:20:13 -08:00
Jason Sams
d99a7be36e Merge "More documentation." 2010-11-12 11:15:59 -08:00
Adam Cohen
0ac116b688 -Prevent StackView from advancing while interacting with it
-Fixed null pointer exception
Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297
2010-11-12 11:04:32 -08:00
Tor Norbye
83e40921b2 Merge "Fix fill color alpha in layoutlib" 2010-11-12 10:43:46 -08:00
Adam Powell
9a0d1d2a25 Merge "Fix bug 3146938 - Menus spawned by ActionBar should hide when action bar is hidden" 2010-11-12 10:37:50 -08:00
Leon Scroggins
c26dc9f38f Provide variable for debugging the text in WebTextView.
Change-Id: I40630e3ab754c9e9805dc674c8c0c6c8688973c3
2010-11-12 13:08:14 -05:00
Alon Albert
95b831be6b Merge "Improve logging" 2010-11-12 09:57:49 -08:00
Jaikumar Ganesh
fb7f721896 Merge "Don't call cancel discovery when its already canceelled." 2010-11-12 09:45:11 -08:00
Jaikumar Ganesh
58d0dcb75b Don't call cancel discovery when its already canceelled.
Reported by: Leijun Tao

Change-Id: I5f04ecde16d147776a30810210cd3c973aee4d87
2010-11-12 09:41:12 -08:00
Robert Greenwalt
45f8b8bd04 Merge "Make getDataEnabled take more into account." 2010-11-12 08:50:50 -08:00
Leon Scroggins
c35f4ac309 Work on lining up the TextView and web page text.
Bug:3085564

Do not round the text size when applying it to the WebTextView,
so that it will better line up with the text shown on the web
page.

Modify the WebTextView paint to better match the paint used by
webkit.

Update the padding when the zoom level changes.

Change-Id: I284a6febcba2be21dc1ab3f74c6ab5751e1b19b6
2010-11-12 10:41:14 -05:00
Adam Powell
0458796f14 Fix bug 3146938 - Menus spawned by ActionBar should hide when action
bar is hidden

Any popup spawned by the private class MenuPopupHelper will be hidden
if its anchor becomes hidden. ("hidden" == !View#isShown())

Fix a bug where ActionBar subtitle views were not going away when
subtitle text was set to null.

Fix a bug when switching out of ActionBar tabbed nav mode with no
active tabs.

Change-Id: I1f30c067156221f96905ac69ab876418ad2e94f8
2010-11-11 22:55:36 -08:00
Dianne Hackborn
bdd19bc338 Add Theme.Holo.DialogWhenLarge
This theme gives you a dialog look when running on a large
or xlarge screen, otherwise a regular full-screen activity.

Also some new Fragment convenience APIs.

Change-Id: I3d97928ffaa4f3bdfd0cc5daf8823f9235c4ba68
2010-11-11 22:33:20 -08:00
Tor Norbye
135f80dcb4 Fix fill color alpha in layoutlib
new Color(int) ignores the upper 8 bits - it creates a color without
an alpha channel.  In order to pass in rgba we have to use a different
constructor, new Color(int,true).

(In the layout library API we should also specify that the custom
color, if specified, needs to include an alpha, or in particular add
in 0xFF<<24 if the color is opaque.)

Change-Id: I1c44caed8a5780e61b1c799f3b45bef3eb7bc97b
2010-11-11 21:59:23 -08:00
Jim Miller
a4e28d1819 Add password expiration support to DevicePolicyManager.
Change-Id: Ib2629ec547c123ac489d7f4cbd4e0a1d4aa07620
2010-11-11 19:43:24 -08:00
Gil Dobjanschi
0bf3075241 Merge "Invalidate transitions when an image media item duration changes." 2010-11-11 19:09:25 -08:00
Jeff Brown
1aab83501c Merge "Add new keycodes initially used for GoogleTV devices." 2010-11-11 18:47:57 -08:00
Adam Powell
2a88ffe118 Merge "Bug 3183184 - add fade-out for selectable item backgrounds" 2010-11-11 18:41:33 -08:00
Adam Powell
ad16608bac Bug 3183184 - add fade-out for selectable item backgrounds
Change-Id: Id2a1ff4eb7177509f08c20e39bbf1dbf5c25dd5f
2010-11-11 18:39:47 -08:00
Jason Bayer
3adf490a5a Add new keycodes initially used for GoogleTV devices.
Change-Id: I1b901037d6d401931dd3ec6f7d5e1e6ad165d1c9
2010-11-11 18:36:11 -08:00
Xavier Ducrohet
e7bdbf2aa7 Merge "Misc fix in layoutlib bridge + View.isIneditMode as delegate." 2010-11-11 17:43:28 -08:00
Xavier Ducrohet
071dee288c Misc fix in layoutlib bridge + View.isIneditMode as delegate.
Change-Id: Ideab29167e933203da99d4270cebcb777726201f
2010-11-11 17:39:50 -08:00
Eric Laurent
fc1bbf1b7d Merge "Temporary workaround for issue 3187563" 2010-11-11 17:24:27 -08:00
Andreas Huber
237e5fba32 Merge "Increase the prefetcher's low water mark so it restarts fetching data earlier." 2010-11-11 17:15:52 -08:00
Scott Main
565c09786d am 16555c60: am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
* commit '16555c60f7231b014375cbc62fd83b1c53879984':
  docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
2010-11-11 17:12:32 -08:00
Wink Saville
a09c4b2ec7 Merge "GsmServiceStateTracker#getPhone should be protected not public." 2010-11-11 17:04:38 -08:00
Scott Main
16555c60f7 am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
* commit 'd6b9d078ecf1b4d7cc57375830cf2ce390fc893c':
  docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
2010-11-11 17:02:54 -08:00
Andreas Huber
3de594d370 Increase the prefetcher's low water mark so it restarts fetching data earlier.
720p high bitrate content pretty much requires this.

Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
2010-11-11 17:01:43 -08:00
Scott Main
d6b9d078ec Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread 2010-11-11 16:56:19 -08:00
Elliott Hughes
7d580b237f Merge "Use deliberately public API rather than org.apache cruft." 2010-11-11 16:54:07 -08:00
Eric Laurent
065299b58d Temporary workaround for issue 3187563
The audio HAL does not always handle properly simultaneous input and output stream
state changes. This happens in particular when starting video record because output
stream starts and stops while input is active.

Temporary disable the video record jingle the time the audio HAL issues are solved.

Change-Id: I3b923d81af543a335deae9e22d7f396bb5791d91
2010-11-11 16:47:38 -08:00
Chet Haase
e7d2295c06 make ResourceCache for display lists thread-safe
Change-Id: I41885b4ae249d7d7c000bab17bf32340ba85ab3a
2010-11-11 16:44:46 -08:00
Elliott Hughes
460c26e987 Use deliberately public API rather than org.apache cruft.
InputStreamHelper is scheduled for deletion. As a bonus, the new code is more
efficient.

Change-Id: Ied8b87fa24f8506cf748b0d4c99ee7e2ae201483
2010-11-11 16:42:09 -08:00
Vasu Nori
7c5c9e4717 Merge "add column to downloads table to store error msg when a download fails" 2010-11-11 16:35:43 -08:00
Wink Saville
7ef3361adc GsmServiceStateTracker#getPhone should be protected not public.
Change-Id: Ie8c1ac0a38616e4794aa51b9b642d9b22008b9ff
2010-11-11 16:13:01 -08:00
Adam Powell
61a6315e66 Merge "First pass at styling progress bars for Holo." 2010-11-11 16:04:09 -08:00
Eric Fischer
059899cbb7 am 9acf04ab: (-s ours) am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '9acf04ab6a6327449f46e83679ec54967e092944':
  Import revised translations.  DO NOT MERGE
2010-11-11 15:53:19 -08:00
Eric Fischer
9acf04ab6a am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
  Import revised translations.  DO NOT MERGE
2010-11-11 15:49:03 -08:00
Andreas Huber
dcdb6d001d Merge "Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun." 2010-11-11 15:45:04 -08:00
Eric Fischer
3082e5fed0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:44:04 -08:00
Romain Guy
add94f204c Merge "Free resources only from the GL context thread. Bug #3179882" 2010-11-11 15:42:35 -08:00
Jaikumar Ganesh
3ca2ee0f03 Merge "Fix crash in dump function." 2010-11-11 15:38:21 -08:00
Andreas Huber
10b920cd99 Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun.
Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3

Conflicts:

	media/libstagefright/AwesomePlayer.cpp
2010-11-11 15:37:17 -08:00
Romain Guy
fe48f65922 Free resources only from the GL context thread.
Bug #3179882

Resources were freed following garbage collections on a worker thread.
This worker thread had no EGL context, which would cause the renderer
to incorrectly assume that the memory was liberated.

Change-Id: Ifdb51f94ddf42641e8654522787bfac532976c7c
2010-11-11 15:36:56 -08:00
Jamie Gennis
7ab17a3426 Merge "Implement reducing the buffer count of a Surface." 2010-11-11 15:26:21 -08:00
Vasu Nori
4015de2a08 add column to downloads table to store error msg when a download fails
useful for debugging for bugs like bug:3187299
without this error message, one doesn't know WHY downloads
fail.
there is a STOPSHIP comment around storage of this error
message in database.

Change-Id: I1fa49ee9eb97be16aced1611ab30a286b0b6c8d2
2010-11-11 15:22:13 -08:00
Robert Greenwalt
ec44c26f42 Make getDataEnabled take more into account.
getDataEnabled and getAnyDataEnabled ignored mMasterDataEnabled.
bug: 2216392

Change-Id: Ic3ae0808d2a02057ddf5056d3e01f754f2e57f5c
2010-11-11 15:18:51 -08:00
Jaikumar Ganesh
bb0773fac8 Fix crash in dump function.
Change-Id: I5a4cd7cf3fd325ced5d05f036c191f759dee16e0
2010-11-11 15:18:19 -08:00
Adam Powell
021aad952b First pass at styling progress bars for Holo.
Added attribute to let scale drawables size based on the intrinsic
width and height as a minimum. This helps prevent artifacts when
some 9-patches are used in situations like progress bars.

Change-Id: I168a232d3225afe9b5578a05a9b8634a1084404c
2010-11-11 14:53:29 -08:00