28640 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
7381541309 Ignore 87624778
It already exists in this branch

Change-Id: Ic4329e543d34828f41040dc264260be9d03a20e7
2010-08-13 14:24:06 -07:00
Ficus Kirkpatrick
7525c2cfbb Merge "Add --max-res-version flag to aapt." into gingerbread 2010-08-13 14:22:34 -07:00
Ficus Kirkpatrick
588f228d6a 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 froyo.

Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb
2010-08-13 14:20:51 -07:00
Romain Guy
1e4aa48cfd Merge "fix [2912927] Can't get NV_draw_path extension to work" into gingerbread 2010-08-13 14:18:55 -07:00
Mathias Agopian
ab5750115d fix [2912927] Can't get NV_draw_path extension to work
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.

Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
2010-08-13 14:17:58 -07:00
Ficus Kirkpatrick
2abde6e0dd 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 eclair.

Change-Id: I40ccf820c8a6e3074fccc987dd60a511dd8eb0de
2010-08-13 14:13:08 -07:00
Ying Wang
561a91824f Output proguard keep flags for fragment classes.
Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec
Bug: 2916847
2010-08-13 14:06:58 -07:00
Jake Hamby
17f616823a Fix character count bug and Javadoc typos in SMS (with test cases)
Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").

You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.

Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
2010-08-13 14:01:31 -07:00
Shimeng (Simon) Wang
74521b17fe Merge "Change scale for large screen reading when double tapped." 2010-08-13 13:56:42 -07:00
Shimeng (Simon) Wang
dde858cbb6 Change scale for large screen reading when double tapped.
This happens when default and overview scales have not much difference.

This solves the double tap issue for large screen devices,
where overview and default scale are the same.  The code works well
with phone device as well.

Change-Id: Iac7f66369d58a152de8de7025b326d1672da30d4
2010-08-13 13:52:42 -07:00
Adam Cohen
8e7b1f750e Merge "-> Refactored and cleaned up dragging / animations -> Added methods to generate blue glow outline -> Added "res-out" effect -> Added some influence for dragging left / right" 2010-08-13 13:50:31 -07:00
Adam Cohen
32a42f1587 -> Refactored and cleaned up dragging / animations
-> Added methods to generate blue glow  outline
-> Added "res-out" effect
-> Added some influence for dragging left / right

Change-Id: I4bdbe4c3bd843ed5616b1ea359a3b0af1c151814
2010-08-13 13:46:47 -07:00
Daisuke Miyakawa
24bb2a708d Merge "Make the doc for PreferenceScreen aware of PreferenceFragment." 2010-08-13 13:42:56 -07:00
Adam Powell
00146321f8 Merge "Clean up some Action Bar style handling." 2010-08-13 13:42:32 -07:00
Daisuke Miyakawa
52a50782d5 Make the doc for PreferenceScreen aware of PreferenceFragment.
This class has existed from before, so the doc does not mention
PreferenceFragment but only PreferenceActivity, while actually
the class can be used via PreferenceFragment.

Change-Id: Ie3756f7ff260cff829eff31a6ba99260c681bc2d
2010-08-13 13:20:04 -07:00
Jake Hamby
a8f39537ca Fix typo and bug in CTS test class.
- Fix Javadoc typo in PhoneSubInfo.java
- Fix ArrayIndexOutOfBoundsException in SimulatedCommands.java

Change-Id: I40dcd52cf9d6990f1f845fca5c1d61cdff93f4d7
2010-08-13 12:16:15 -07:00
Daniel Sandler
86d32939b6 Merge "Battery meter now functioning in the system bar and settings panel." 2010-08-13 12:06:06 -07:00
Daniel Sandler
1e3ed8fc95 Battery meter now functioning in the system bar and settings panel.
Change-Id: I08881a597f166eaeabd01d550a59109661535639
2010-08-13 15:04:40 -04:00
Adam Powell
e2194445b0 Clean up some Action Bar style handling.
Action Bar now obeys the titleTextStyle/subtitleTextStyle attributes
and has a better way of handling custom sizes. Any attached Action
Mode bar will keep in sync with the Action Bar's height.

Change-Id: I7d16319f5609d4d6c80a3043dcb60303e6e903db
2010-08-13 11:41:53 -07:00
Dmitri Plotnikov
7777bb0cad Merge "Keep the '+' when normalizing the phone number" 2010-08-13 11:38:06 -07:00
Dmitri Plotnikov
3e4b7c332f Keep the '+' when normalizing the phone number
Change-Id: I24731735ed18dbc92a643a0d99d35a1b58be40c8
2010-08-13 11:09:29 -07:00
Alex Sakhartchouk
04ba60895a Merge "Renderscript scenegraph prototype." 2010-08-13 10:45:48 -07:00
Alex Sakhartchouk
094a068bc4 Renderscript scenegraph prototype.
Change-Id: Ic4daaf6eca8850caf46bd766e148cf12eb6c6ca1
2010-08-13 10:44:14 -07:00
Mikael Kanstrup
876247784e DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response.
When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.

Change-Id: Ie68cd107872d233bf422e24130a1eb9f6432db91
Bug: 2834260
2010-08-13 10:24:04 -07:00
Maksymilian Osowski
aba188523c Merge "Added copyright information to the files that were missing it." 2010-08-13 10:23:52 -07:00
Erik Gilling
122f14fa7d am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists
Merge commit '94364b91a2894bf037b8beb027132fbb812e1434' into gingerbread-plus-aosp

* commit '94364b91a2894bf037b8beb027132fbb812e1434':
  surfaceflinger: don't check HWComposer numLayers unless one exists
2010-08-13 10:13:39 -07:00
Erik Gilling
94364b91a2 surfaceflinger: don't check HWComposer numLayers unless one exists
Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c
2010-08-13 10:10:48 -07:00
Jean-Baptiste Queru
72dc780f57 Fix build: tweak documentation links
Change-Id: I9c9c8615086b7173f4ad68b5183e7699275c7a2d
2010-08-13 09:25:19 -07:00
Maksymilian Osowski
073d2c9aa9 Added copyright information to the files that were missing it.
Change-Id: I3b814f2fbd96384189e702e723764d17cbbde5fe
2010-08-13 17:12:51 +01:00
Eric Laurent
f28608cdf4 am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
Merge commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a' into gingerbread-plus-aosp

* commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a':
  Fix issue 2909189: System property ro.audio.silent no longer mutes system.
2010-08-13 08:06:23 -07:00
Eric Laurent
c8d0d6307f Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread 2010-08-13 08:00:14 -07:00
Ben Murdoch
3778a632a0 Merge "Merge WebKit at r65072 : Update DRT ignore list." 2010-08-13 05:20:08 -07:00
Ben Murdoch
713ad437d6 Merge "Merge WebKit at r65072 : Update User Agent string with new webkit version." 2010-08-13 05:19:53 -07:00
Ben Murdoch
e7611352ae Merge WebKit at r65072 : Update DRT ignore list.
This merge introduces two new Geolocation tests that to pass we need
a new LayoutTestController function. We ignore those tests until this
function is added - see b/2914450

Change-Id: If13dda2caa467b771d4a21d60463319019cc7679
2010-08-13 13:18:41 +01:00
Ben Murdoch
bb3ed52803 Merge WebKit at r65072 : Update User Agent string with new webkit version.
Change-Id: I3bbb4b10ae54387c7237410981f3da5a599a04d0
2010-08-13 13:18:41 +01:00
Maksymilian Osowski
71e1a7aa5e Merge "Added python script that starts/stops apache2 server on host machine configured to handle http layout tests." 2010-08-13 05:18:20 -07:00
Maksymilian Osowski
74b13aecbe Added python script that starts/stops apache2 server on host machine configured to handle http layout tests.
Change-Id: I7bf4390dfb4f9a580e6e4ca0eb25c85655df723c
2010-08-13 12:07:17 +01:00
Erik Gilling
0cf2f4354b surfaceflinger: don't check HWComposer numLayers unless one exists
Change-Id: I6524f46910b761cff3ef696edf5a65a424879faa
2010-08-12 23:21:40 -07:00
Dmitri Plotnikov
eb7845e672 Merge "Adding query-based aggregation suggestions" 2010-08-12 18:35:28 -07:00
John Wang
c178b95c1f am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gingerbread
Merge commit '2835391c1709a2b655940200dab0fc74ef08512d'

* commit '2835391c1709a2b655940200dab0fc74ef08512d':
  Update switch call and accept call.
2010-08-12 17:35:53 -07:00
John Wang
2835391c17 am 686a9505: Merge "Update switch call and accept call." into gingerbread
Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp

* commit '686a95055896c221c62fe7f4c3dda137809df91e':
  Update switch call and accept call.
2010-08-12 17:33:19 -07:00
John Wang
686a950558 Merge "Update switch call and accept call." into gingerbread 2010-08-12 17:30:38 -07:00
Dianne Hackborn
b7a2e47722 Fragment and PreferenceFragment and FragmentManager, oh my!
- Introduce FragmentManager public API, for all Fragment management
  needs.  Will in the future allow the removal of the (growing number
  of) fragment APIs on Activity.

- Fragment now has a concept of arguments.  This can be supplied
  immediately after creation, and are retained across instances.

- PreferenceActivity now has an API to have it update its headers (note
  not tested).  Headers now have arguments.  Keys for controlling
  when PreferenceActivity shows at launch have been added to the SDK.

- Fixes to back stack handling and state saving/restoring.

Change-Id: Ib9d07ae2beb296c4eb3a4d9e1b3b59544675e819
2010-08-12 17:23:48 -07:00
James Dong
67dfaec8cf am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:
Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'

* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
  Mainly fix two mistakes that I made:
2010-08-12 17:05:28 -07:00
Jason Sams
4e806c596f Merge "Start adding RS tests." 2010-08-12 17:03:47 -07:00
James Dong
38a9f4050a am e95d192f: Mainly fix two mistakes that I made:
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp

* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
  Mainly fix two mistakes that I made:
2010-08-12 17:02:42 -07:00
Jason Sams
2a114bdc64 Start adding RS tests.
Change-Id: I025357407eca3e515823493ff63e4c78249e8126
2010-08-12 17:00:09 -07:00
Jason Sams
2a115d8422 Merge "Thread launch strategies." 2010-08-12 16:59:18 -07:00
Mike Dodd
bf19bce301 am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'

* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
  Support getting codec, width, and height in URL for gtalk playback.
2010-08-12 16:50:39 -07:00
Eric Fischer
3065eb1b72 Merge "Import revised translations." 2010-08-12 16:48:41 -07:00