33165 Commits

Author SHA1 Message Date
Gilles Debunne
0f935ebfff am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800'

* commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
  Restored ic_dialog_menu_generic asset.
2010-10-05 17:02:27 -07:00
Shimeng (Simon) Wang
bf01312965 Add wrapper method for native JNI call.
This is to check whether a given mimeType is supported in Android media
framework.

issue: 2816278
Change-Id: I66d379d039c4e1f4a8528654ece006335fd4463f
2010-10-05 16:59:05 -07:00
Vasu Nori
790762ca8f annotate some tests large - just in case they take longer. bug:3066136
Change-Id: I89ab0454f592748f971b678a3ae23724eb6fc2e5
2010-10-05 16:53:57 -07:00
Vasu Nori
572ce01e9e Merge "turn off some useless messages" 2010-10-05 16:53:24 -07:00
Vasu Nori
b7e2c783af turn off some useless messages
Change-Id: I5ed5696cd052b70e7cf7b872205470cd56fada90
2010-10-05 16:50:51 -07:00
Adam Powell
ee7e0efcc1 am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp

* commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
2010-10-05 16:46:05 -07:00
Adam Powell
59c4cb9e8f Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 2010-10-05 16:39:24 -07:00
Gilles Debunne
d688b0cc40 am 8556efe5: (-s ours) am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920'

* commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920':
  DO NOT MERGE. Select word no longer selects spaces between words.
2010-10-05 16:16:20 -07:00
Scott Main
996acec5bd am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f'

* commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f':
  docs: update homepage with more countries for market announcement
2010-10-05 16:15:44 -07:00
Adam Powell
65e8b47624 am 5a5fff71: Fix bug 3064143 - remove default bold on buttons
Merge commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp

* commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
  Fix bug 3064143 - remove default bold on buttons
2010-10-05 15:49:23 -07:00
Adam Powell
5a5fff7101 Fix bug 3064143 - remove default bold on buttons
Change-Id: Id4d09d50270c575f5179328ab6fb788b45131638
2010-10-05 15:32:48 -07:00
Alex Sakhartchouk
eccce09f1e Merge "Adding average fps counter. Removing rsLight from libRS" 2010-10-05 15:32:38 -07:00
Adam Powell
737e8fe2c7 DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
Change-Id: If34c8ea4e15697420adad0bc404f3c278efd7c1b
2010-10-05 15:22:07 -07:00
Chet Haase
2e292e9da4 Merge "Adding next/prev to fragment animations and to PreferenceActivity" 2010-10-05 15:21:34 -07:00
Scott Main
5302798581 Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced." 2010-10-05 15:19:27 -07:00
Scott Main
537b222514 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'

* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-05 15:17:40 -07:00
James Dong
73fe79da09 am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
  Resilent media time stamp adjustment
2010-10-05 15:17:29 -07:00
Gilles Debunne
a4a01b5d6b am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'

* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
  Removed icon in Alert dialog header.
2010-10-05 15:17:17 -07:00
Adam Powell
195e9d8adb am dcbf315e: am 368733b2: Remove overscroll_edge.png from drawable/
Merge commit 'dcbf315e83234623622bd268a823ecc4dc49e375'

* commit 'dcbf315e83234623622bd268a823ecc4dc49e375':
  Remove overscroll_edge.png from drawable/
2010-10-05 15:17:05 -07:00
Adam Powell
59124abf2d am b8d3bc5c: (-s ours) am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'

* commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
  Fix bug 3052686 - ScrollView padding treated incorrectly
2010-10-05 15:16:48 -07:00
Chet Haase
9ff82bf2b3 Adding next/prev to fragment animations and to PreferenceActivity
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).

Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
2010-10-05 15:13:24 -07:00
Scott Main
f6fe78b2ae docs: Rewrite of App Fundamentals.. Part 1.
This introduces two new docs:
Activities
  Provides a fundamental introduction to how activities work, including
  the basics about layout, manifest entries, starting activies, getting results,
  and the complete discussion about the lifecycle (which used to be in the
  fundamentals.jd document under "Component Lifecycles"), but also now includes more
  information about saving instance state (with new diagrams).
Tasks and Back Stack
  A large expansion of the material originally presented in the fundamentals.jd
  document under "Activities and Tasks". This doc talks all about how tasks and
  the back stack work. This content re-organization is important because fragments
  can now become a part of the back stack (which is a task-oriented concept), thus,
  it's important to separate the task ideas from being tied directly to activities only,
  which is how tasks are currently discussed. However, fragments are not yet discussed
  here in detail---that will come later when the fragment dev guide is introduced.

Change-Id: I46425b5c2c3b928dc81bafd05a88ad3ea1c5be53
2010-10-05 15:06:33 -07:00
Romain Guy
10bc365225 Merge "Add support for paletted textures." 2010-10-05 15:00:01 -07:00
Romain Guy
7adaf3d1aa Add support for paletted textures.
Change-Id: I36e6069bd58f78c609cdd1f3e4560c98f128f48e
2010-10-05 14:58:09 -07:00
Dianne Hackborn
e112b744c0 am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread
Merge commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6' into gingerbread-plus-aosp

* commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6':
  Fix issue #3056500: Problem report for ASTRO
2010-10-05 14:45:32 -07:00
Joe Onorato
2c164747d3 am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit 'f7872780ca3dae9584251b1e3495aed12110254c' into gingerbread-plus-aosp

* commit 'f7872780ca3dae9584251b1e3495aed12110254c':
  PowerManagerService needs yet another flag...
2010-10-05 14:45:28 -07:00
Dianne Hackborn
930d6c3cd5 Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread 2010-10-05 14:42:04 -07:00
Eric Laurent
9a30fc13f5 Fixed AudioFlinger not always pausing tracks
If the pause request is received before the AudioTrack buffer was
completelly filled and the track ready for mixing, the pause is
not executed: the track just underruns and stays in pausing state.

The fix consists in considering the track ready for mixing immediately
if pausing.

Change-Id: Ia6cb4703fee2126e41011a6400ea8eeb3a3e5456
2010-10-05 14:41:42 -07:00
Joe Onorato
f7872780ca Merge "PowerManagerService needs yet another flag..." into gingerbread 2010-10-05 14:41:16 -07:00
Dianne Hackborn
817c24752c Fix issue #3056500: Problem report for ASTRO
Change-Id: Ifa07dbc50930f5d6a20cdc0ee541c0566f3785ba
2010-10-05 14:40:22 -07:00
Joe Onorato
8274a0e536 PowerManagerService needs yet another flag...
... to make sure that if you press the power button to turn off the
screen, that the prox sensor won't turn it back on.

Bug: 3011618
Change-Id: Id16c1d65417539d4592f485b1c3efb737540c3cd
2010-10-05 17:39:01 -04:00
Andreas Huber
56ee1080f0 am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp

* commit '17bc4f65324a823598e7671256c815bf32ddcc95':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2010-10-05 14:13:16 -07:00
Andreas Huber
17bc4f6532 Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread 2010-10-05 14:09:32 -07:00
Dianne Hackborn
90f4aafa33 Implement permission granting in clipboard.
Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
2010-10-05 14:09:08 -07:00
Kenny Root
cfc80bd5c1 am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit '2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp

* commit '2c3360fe9c03536cbfd77267170b73c120c071ac':
  Remove lingering system app native libs in /data
2010-10-05 14:07:29 -07:00
Kenny Root
2c3360fe9c Merge "Remove lingering system app native libs in /data" into gingerbread 2010-10-05 14:04:26 -07:00
Andreas Huber
c743f4506f Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
Change-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56
2010-10-05 13:53:39 -07:00
Romain Guy
e21635571e Merge "Code cleanup and disable display lists for now." 2010-10-05 13:44:24 -07:00
Christopher Tate
643bfdaf45 Merge "Make View.DragThumbnailBuilder a static class" 2010-10-05 13:43:44 -07:00
Romain Guy
469b1dbeaf Code cleanup and disable display lists for now.
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
2010-10-05 13:42:35 -07:00
Jason Sams
68159aabb3 Merge "Implement allocation resizing." 2010-10-05 13:35:47 -07:00
Jason Sams
5edc608a07 Implement allocation resizing.
Change-Id: Ie38d42419d595cec730a8721cc1321c5edb6b4d6
2010-10-05 13:32:49 -07:00
Alex Sakhartchouk
76322af2a6 Adding average fps counter.
Removing rsLight from libRS

Change-Id: I8622efd10619dc120d37f3a12122e9c7fc34ff2e
2010-10-05 13:28:09 -07:00
Jeff Brown
56364bcd0d am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '78d15acfb20269ce263ce19514a2c0e7a98409e2' into gingerbread-plus-aosp

* commit '78d15acfb20269ce263ce19514a2c0e7a98409e2':
  Make secure views tolerate IME overlays.
2010-10-05 13:17:04 -07:00
Christopher Tate
a0374192b9 Make View.DragThumbnailBuilder a static class
It also now uses a WeakReference to the associated View, not a hard
object pointer.

Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
2010-10-05 13:14:25 -07:00
Alex Sakhartchouk
cd1b8d3665 Merge "Adding text metrics to renderscript." 2010-10-05 13:13:40 -07:00
Kenny Root
f2cc2e5221 am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
Merge commit '8735c4cda00de26127d694bfbc81e192c4caca44' into gingerbread-plus-aosp

* commit '8735c4cda00de26127d694bfbc81e192c4caca44':
  Get correct native library path on reinstall
2010-10-05 13:13:36 -07:00
Dianne Hackborn
5d722580af am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread
Merge commit 'e02e41f484a115b5278dcc07f2d6c90819279800' into gingerbread-plus-aosp

* commit 'e02e41f484a115b5278dcc07f2d6c90819279800':
  DO NOT MERGE: Get rid of status bar's dim during night.
2010-10-05 13:13:25 -07:00
Jeff Brown
78d15acfb2 Merge "Make secure views tolerate IME overlays." into gingerbread 2010-10-05 13:06:05 -07:00
Mike Lockwood
6327a9fece resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp
Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059
2010-10-05 16:00:13 -04:00