12549 Commits

Author SHA1 Message Date
Adam Powell
fbb72fdbe5 Fix bug 2923440 - ActionMode buttons show as action by default
The MenuInflater returned by ActionModes will set the default
showAsAction value to "ifRoom" if not otherwise specified.

Change-Id: I86045dc4e877a97a3464a1a5f44d8d1e2120b086
2010-08-16 18:02:58 -07:00
Adam Powell
6236d61400 Merge "Fix some ActionBar bugs." 2010-08-16 17:41:07 -07:00
Adam Powell
266b1008cf Fix some ActionBar bugs.
* Fix a bug where the options panel would not open on non-xlarge
  screens to show overflow menu items.

* Fix a bug where ActionBarView would try to add a custom nav view
  twice.

* Fix a bug where ActionBarView would expand too far in wrap_content mode

Change-Id: I433ea56524aad885d813ae8743fe2fcefa9649fa
2010-08-16 17:26:11 -07:00
Mathias Agopian
0ab1d7f552 am 98a94989: am 833533c9: Improve Display javadoc slightly
Merge commit '98a94989dd5fbf3da61329d0232a84a0e2dfcb74'

* commit '98a94989dd5fbf3da61329d0232a84a0e2dfcb74':
  Improve Display javadoc slightly
2010-08-16 16:58:14 -07:00
Mathias Agopian
98a94989dd am 833533c9: Improve Display javadoc slightly
Merge commit '833533c9292f860e4dfc060a4eba6429cd259ed4' into gingerbread-plus-aosp

* commit '833533c9292f860e4dfc060a4eba6429cd259ed4':
  Improve Display javadoc slightly
2010-08-16 16:54:49 -07:00
Doug Zongker
4961e4793f am bb33d6fd: am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread
Merge commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2'

* commit 'bb33d6fd987727c24372d7b7109ec5d1db82efe2':
  add an api for getting a device serial number
2010-08-16 15:19:21 -07:00
Dianne Hackborn
a10382b67d am 2e47052f: am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread
Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c'

* commit '2e47052fc4ad3439adc2322fd953fd58a85d457c':
  Fix problems with determining when to kill apps for wake usage.
2010-08-16 15:18:27 -07:00
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
Mathias Agopian
833533c929 Improve Display javadoc slightly
Change-Id: Iaa7d599e11d42d4aaf50e87b141f9b8d04ba445e
2010-08-16 13:30:20 -07:00
Doug Zongker
bb33d6fd98 am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread
Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp

* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
  add an api for getting a device serial number
2010-08-16 13:20:05 -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
Doug Zongker
997dc32b6b Merge "add an api for getting a device serial number" into gingerbread 2010-08-16 09:19:40 -07:00
Doug Zongker
7d2e3df60d add an api for getting a device serial number
Add a constant to android.os.Build that returns a device-specific
alphanumeric serial number.  It's optional -- it may be blank --
though CTS will require it to be present for non-telephony devices.

Change-Id: I338ae5f43ba679a5e98f2f437dc4efdaef0c835d
2010-08-16 09:18:50 -07:00
Dianne Hackborn
3f00be5bd0 Fix build.
Change-Id: I9e887aacf3d3ba642df287dfdecbc2ff1ef02033
2010-08-15 18:03:27 -07:00
Dianne Hackborn
2e47052fc4 am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread
Merge commit '567722eee190f7cf88dc7ea95167db76d5514842' into gingerbread-plus-aosp

* commit '567722eee190f7cf88dc7ea95167db76d5514842':
  Fix problems with determining when to kill apps for wake usage.
2010-08-15 17:34:49 -07:00
Dianne Hackborn
567722eee1 Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 2010-08-15 17:33:02 -07:00
Dianne Hackborn
1ebccf531d Fix problems with determining when to kill apps for wake usage.
Also improve debug printing of various times.

Change-Id: Ifcc288fd1bcbf44c069875ba97925b9e7ffe9a48
2010-08-15 17:27:29 -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
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
Robert Greenwalt
993f85f319 am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.
2010-08-13 16:03:29 -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
Robert Greenwalt
e300b8c10c Merge "DO NOT MERGE Always set/remove default routes." into gingerbread 2010-08-13 15:59:53 -07:00
Robert Greenwalt
b738fb9938 DO NOT MERGE Always set/remove default routes.
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa
2010-08-13 15:53:13 -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
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
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
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
Gilles Debunne
9a30556b9a Changed default background colors to new UI style.
Change-Id: I069fe2047d16fb6f4c7870412386ba40bd0ebd39
2010-08-13 14:38:51 -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
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
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
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
Jean-Baptiste Queru
72dc780f57 Fix build: tweak documentation links
Change-Id: I9c9c8615086b7173f4ad68b5183e7699275c7a2d
2010-08-13 09:25:19 -07: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
Dmitri Plotnikov
eb7845e672 Merge "Adding query-based aggregation suggestions" 2010-08-12 18:35:28 -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
Eric Fischer
3d173c3040 Import revised translations.
Change-Id: I0b89d1baf9ed02c492e8845f45fad1bee56e8d56
2010-08-12 16:44:07 -07:00