28592 Commits

Author SHA1 Message Date
Dianne Hackborn
0a56fdc140 am 66b0343e: am a8d9291d: Merge "Various battery info things:" into gingerbread
Merge commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b'

* commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b':
  Various battery info things:
2010-08-16 15:17:46 -07:00
Ying Wang
af4798d9c3 am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread
Merge commit '8cfd3c01e4582a587765588c02234527e7808ca0'

* commit '8cfd3c01e4582a587765588c02234527e7808ca0':
  Output proguard keep flags for fragment classes.
2010-08-16 15:16:52 -07:00
Jake Hamby
a774f5817b resolved conflicts for merge of 31202b1a to master
Change-Id: Ia8ae32c5ebcd13843ed9cc82c80bf551b38e586f
2010-08-16 14:42:01 -07:00
Jason Sams
43c31421b4 Remove extra float<>int conversions in ImageProcessing.
Remove or shrink test bitmaps for Fountain and ModelViewer.

Change-Id: Ieeb530375aebb6b953aa564788fc5b5ef21a362e
2010-08-16 12:56:08 -07:00
Jason Sams
02f62aa7d1 Support reference operations in RS scripts.
Change-Id: I9cb5f3cb71823ab24ca51bf0167a0f52cf0691f9
2010-08-16 12:41:48 -07:00
Adam Powell
93af2e48a7 Merge "Add selection mode support to GridView." 2010-08-16 11:33:12 -07:00
Adam Powell
f343e1ba7e Add selection mode support to GridView.
Changed 9.xml to make update-api behave with the API change involved.
Several fields and methods moved from ListView to AbsListView. This
should not break source or binary compatibility.

Change-Id: Icad6e238522b8b7cc5bbc935ad89ac3e015572c1
2010-08-16 11:05:57 -07:00
Romain Guy
893ce24ffb Merge "Add documentation for fillViewport." 2010-08-16 10:56:14 -07:00
Romain Guy
fdbf484be1 Add documentation for fillViewport.
Change-Id: I34f5418ca33933dc5cf65f4e417d918bce83ab96
2010-08-16 10:55:49 -07:00
Shimeng (Simon) Wang
fbb1bb8ab7 Merge "Update variable to reflect its true value." 2010-08-16 10:30:28 -07:00
Eric Fischer
fed762b944 am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread
Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79'

* commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79':
  Change aapt's warning message to suggest formatted="false", not "true".
2010-08-16 07:49:51 -07:00
Jake Hamby
c93ba8ed0d am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread
Merge commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34'

* commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34':
  Fix typo and bug in CTS test class.
2010-08-16 07:49:44 -07:00
Ficus Kirkpatrick
6e9b12760f am 44e0d5ca: am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.
Merge commit '44e0d5ca752db52f2f02e475ecd254b676e50be2'

* commit '44e0d5ca752db52f2f02e475ecd254b676e50be2':
  Add --max-res-version flag to aapt.
2010-08-16 07:49:38 -07:00
Ficus Kirkpatrick
f4d954a126 am 0f414272: am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
Merge commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4'

* commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4':
  Add --max-res-version flag to aapt.
2010-08-16 07:49:30 -07:00
Romain Guy
d601649e6a am a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread
Merge commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac'

* commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac':
  fix [2912927] Can't get NV_draw_path extension to work
2010-08-16 07:49:24 -07:00
Jean-Baptiste Queru
79b2cf3c65 am 73815413: Ignore 87624778
Merge commit '7381541309d515f780879d23857675c9c8ee9344'

* commit '7381541309d515f780879d23857675c9c8ee9344':
  DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response.
2010-08-16 07:49:13 -07:00
Erik Gilling
4f35d62abc am 122f14fa: am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists
Merge commit '122f14fa7d0ac4d7a62757f596431286f6ab037f'

* commit '122f14fa7d0ac4d7a62757f596431286f6ab037f':
  surfaceflinger: don't check HWComposer numLayers unless one exists
2010-08-16 07:45:00 -07:00
satok
13984a253d Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
This reverts commit f2e67a5779d404b4791c6ab5b0d30dfb2c463514.

bug: 2914259
open source change: https://review.source.android.com/#change,16419
Change-Id: I39df188a52ad9566aa523ce31f696886d4cdb980
2010-08-16 16:09:48 +09:00
Dianne Hackborn
3f00be5bd0 Fix build.
Change-Id: I9e887aacf3d3ba642df287dfdecbc2ff1ef02033
2010-08-15 18:03:27 -07:00
Dianne Hackborn
def1537e9e More fragment work:
- Introduce FragmentManager as a public API, deprecating the fragment
  APIs on Activity.  (They will be removed soon.)
- Add APIs to write a fragment reference to a bundle and later retrieve
  it.
- Add Fragment API to set another fragment as its target, for delivering
  results.
- Change when onInflate() is called and formalize its meaning in relation
  to the fragment arguments that were previously introduced.
- Change onDestroyView() to always be called, regardless of when
  onCreateView() returns.  It now also is called slightly differently,
  after the view hierarchy's state is saved.
- Fix some issues with DialogFragment's lifecycle with its associated
  Dialog and state save/restore.
- Preference can now have a Bundle associated with it to provide
  arguments to a fragment.  The data for this Bundle call be supplied
  via <extra> tags under a PreferenceScreen.
- PreferenceActivity's header XML tags are now <preference-headers>
  and <header>, and you can supply <extra> tags under a <header> to set
  arguments for the header's fragment.

Change-Id: I22c212c9fa862d50840201ca16e51f9de5ef0031
2010-08-15 17:20:59 -07:00
Wink Saville
270f46d97c Merge "Add documentation to NetworkStateTracker and a small change to the API." 2010-08-14 09:29:21 -07:00
Romain Guy
1e45aae5de Add drop shadows.
Change-Id: Ic6a72409d4785968d1fbdff229f17ee5c00b240b
2010-08-13 19:41:14 -07:00
Eric Laurent
029a74a38b am f28608cd: am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
Merge commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31'

* commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31':
  Fix issue 2909189: System property ro.audio.silent no longer mutes system.
2010-08-13 17:23:53 -07:00
Daniel Lehmann
1b810073d8 Merge "Reran update-api" 2010-08-13 16:22:43 -07:00
Daniel Lehmann
218ea20881 Reran update-api
Change-Id: I8e1f988174a2b730a9a2ee6ee3affd07288d7c0c
2010-08-13 16:21:44 -07:00
Wink Saville
c7a98341b0 Add documentation to NetworkStateTracker and a small change to the API.
Also, removed some unused NetworkStateTracker event codes.

The API change was to add context and target to startMonitor, this makes
it easier to document what the actual interface contract is.

Change-Id: If9b52486c3c281fe4794bc78417c8b03888414b1
2010-08-13 16:11:42 -07:00
Dianne Hackborn
68663bf273 Merge "Fix bug with calls to the typeless open API." 2010-08-13 16:08:08 -07:00
Dianne Hackborn
66b0343e9e am a8d9291d: Merge "Various battery info things:" into gingerbread
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp

* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
  Various battery info things:
2010-08-13 16:00:44 -07:00
Dianne Hackborn
a8d9291d7f Merge "Various battery info things:" into gingerbread 2010-08-13 15:56:29 -07:00
Gilles Debunne
162d709b93 Merge "Changed default background colors to new UI style." 2010-08-13 15:50:38 -07:00
Daniel Lehmann
b332747ee0 Update flags to be consistent with GTalk's
Change-Id: Ibaa6cdc110316139ef0e2fe2fb95b864d28dfb25
2010-08-13 15:38:30 -07:00
Ying Wang
8cfd3c01e4 am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread
Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp

* commit 'e05184f271f9882a5bf828e353aea40e0c06ff69':
  Output proguard keep flags for fragment classes.
2010-08-13 15:29:04 -07:00
Ying Wang
e05184f271 Merge "Output proguard keep flags for fragment classes." into gingerbread 2010-08-13 15:26:21 -07:00
Dianne Hackborn
02dfd26304 Fix bug with calls to the typeless open API.
Fix bug where we weren't using the default stream if a caller
requested "*/*" as a type.  This broke apps calling the old open
APIs on content providers that did not report MIME types.

Change-Id: Id6e3e64e36cb8637097c3a7834b09407c27487d2
2010-08-13 15:23:06 -07:00
Jake Hamby
31202b1a40 am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread
Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp

* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
  Fix character count bug and Javadoc typos in SMS (with test cases)
2010-08-13 15:19:11 -07:00
Dianne Hackborn
9adb9c3b10 Various battery info things:
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.

And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background.  This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.

Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
2010-08-13 15:17:49 -07:00
Jake Hamby
3f442ece25 Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread 2010-08-13 15:15:36 -07:00
Jae Yong Sung
8171b5182f lock screen for xlarge
Change-Id: Iab9f53609bf24be774752a9960aaaa654d7a614f
2010-08-13 15:08:05 -07:00
Shimeng (Simon) Wang
54038acc8c Update variable to reflect its true value.
The stale value will happen when rotating the large screen and make
double tapping not behave well.

Alternatively, shall we get rid of this variable?

issue: 2919307
Change-Id: I2d71e547db42adeb5674accbf79fb0e7fc587fcd
2010-08-13 15:04:14 -07:00
Eric Fischer
d22a1e896c am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread
Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp

* commit '244152bfb9020341953d3e541c85eb3961806378':
  Change aapt's warning message to suggest formatted="false", not "true".
2010-08-13 14:56:47 -07:00
Eric Fischer
244152bfb9 Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread 2010-08-13 14:54:15 -07:00
Jake Hamby
164eb050bd am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread
Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp

* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
  Fix typo and bug in CTS test class.
2010-08-13 14:53:03 -07:00
Jake Hamby
4f17082167 Merge "Fix typo and bug in CTS test class." into gingerbread 2010-08-13 14:51:09 -07:00
Eric Fischer
98ee11ddb7 Change aapt's warning message to suggest formatted="false", not "true".
True is the default and specifying it won't suppress the warning.

Change-Id: I8ecc919b4059bf3321e781649cb46dd2d3807592
2010-08-13 14:49:55 -07:00
Ficus Kirkpatrick
44e0d5ca75 am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.
Merge commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543' into gingerbread-plus-aosp

* commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543':
  Add --max-res-version flag to aapt.
2010-08-13 14:47:38 -07:00
Ficus Kirkpatrick
0a6bfe2ae2 am 2abde6e0: Add --max-res-version flag to aapt.
Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread

* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
  Add --max-res-version flag to aapt.
2010-08-13 14:45:39 -07:00
Alex Sakhartchouk
aece2d0ca0 Merge "Adding bounding box computation." 2010-08-13 14:39:01 -07:00
Gilles Debunne
9a30556b9a Changed default background colors to new UI style.
Change-Id: I069fe2047d16fb6f4c7870412386ba40bd0ebd39
2010-08-13 14:38:51 -07:00
Alex Sakhartchouk
a80145de00 Adding bounding box computation.
Change-Id: I682609312519d9474176556ade7a208c7d0a1323
2010-08-13 14:32:23 -07:00
Ficus Kirkpatrick
41e567f7cf Add --max-res-version flag to aapt.
aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from gingerbread.

Change-Id: I71b889540380cb10bafb40f72582d3af785ae33a
2010-08-13 14:32:05 -07:00