Commit Graph

9753 Commits

Author SHA1 Message Date
Kenny Root
8db59adccf resolved conflicts for merge of b037da40 to master
Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121
2010-08-24 11:48:37 -07:00
Steve Howard
15a4a2cb8e am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit '6d895fdbc023743f3870042e73a5614764e4165b'

* commit '6d895fdbc023743f3870042e73a5614764e4165b':
  Make ProgressBar.setVisibility() remotable.
2010-08-24 11:01:14 -07:00
Jean-Baptiste Queru
a4ddf42673 resolved conflicts for merge of c64b916e to master
Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1
2010-08-24 10:45:16 -07:00
Jean-Baptiste Queru
0a5699654f am f235a519: am ec58dff0: Fix build - remove dead doc link
Merge commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f'

* commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f':
  Fix build - remove dead doc link
2010-08-24 10:25:00 -07:00
Jean-Baptiste Queru
1770b21ab5 am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'

* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
  add new sensor types for handling gyro data and device orientation
2010-08-24 10:17:03 -07:00
Jean-Baptiste Queru
0fc1b793b6 am b13c9bc5: manual merge
Merge commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6'

* commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6':
  BluetoothHeadset.java:
2010-08-24 10:16:28 -07:00
Vasu Nori
4077d7a75d Merge "SQLiteOpenHelper should discard closed singleton database objects" 2010-08-24 10:08:13 -07:00
Kenny Root
53e75ea847 resolved conflicts for merge of 485de781 to master
Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
2010-08-24 09:57:33 -07:00
Dianne Hackborn
37a1e2370f am a3ece8bd: am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread
Merge commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0'

* commit 'a3ece8bde37acd81b08c4e3c1cb0e6d006ade3e0':
  Fix a few small battery stats problems:
2010-08-24 09:03:45 -07:00
Dianne Hackborn
103bff317b am 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '5474b0f8603ee66413c3e44600ca46f162f3089e'

* commit '5474b0f8603ee66413c3e44600ca46f162f3089e':
  Fix bugs with granting permissions through onNewIntent().
2010-08-24 09:01:54 -07:00
Wu-cheng Li
eee09313c6 am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'

* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
  Add camera fps range API.
2010-08-24 09:01:27 -07:00
Steve Block
bb9db22fbb Hook up device sensors for DeviceOrientation
Change-Id: Ic7165a07a02e3c38165b2f92e3ec7368d2b60e19
2010-08-24 16:33:46 +01:00
Derek Sollenberger
41d5e93bbd Move APK monitoring into WebView.
This CL adds the monitoring logic that was removed from the Browser
in a companion CL.  This allows applications other than the Browser
to use special features offered by YouTube and plugins. Additionally,
the pluginManager was refactored to prevent code duplication between
the manager and WebView.

Change-Id: Ie37f248c8edd9d06ae1fd6675dd5f06f04774b09
http://b/2834603
2010-08-24 09:31:59 -04:00
Kristian Monsen
f52435569c Merge "Java calls to get Android specific files." 2010-08-24 04:50:12 -07:00
Dianne Hackborn
214a7fde36 Merge "Make Theme.Holo the default theme for new apps." 2010-08-23 18:53:06 -07:00
Dianne Hackborn
3e6d50cc48 Make Theme.Holo the default theme for new apps.
Also change Holo to have an action bar, instead of a title bar.

Change-Id: I45c2f06938509ae02cde99d1c06c228f86e8e3e8
2010-08-23 18:51:26 -07:00
Jaikumar Ganesh
d9a3d1c215 Merge "Add BNEP_SVC UUID for incoming tethering connections." 2010-08-23 18:33:18 -07:00
Jaikumar Ganesh
34536183f4 Add BNEP_SVC UUID for incoming tethering connections.
Change-Id: I90c24edfd133ac9fa89c3467383cd61fa23954c6
2010-08-23 18:32:03 -07:00
Adam Powell
208e3c586d Merge "Fix some issues with touch event splitting around event timing" 2010-08-23 18:20:56 -07:00
Adam Powell
816c3be1d7 Fix some issues with touch event splitting around event timing
Change-Id: I15d04d226c218ad7b8a5fe43a55c33c3ade2128d
2010-08-23 18:00:14 -07:00
Vasu Nori
cc6f54910d SQLiteOpenHelper should discard closed singleton database objects
bug:2943028
Change-Id: I4b6263cc25413995363158c976d3c723231cc050
2010-08-23 17:08:41 -07:00
Jaikumar Ganesh
ddb2bfeb6e Revert "Allow reliable detection of a message that is in use."
This reverts commit 6083d81ce4.
Reverting this because it causes runtime to reboot in a loop
if connected to a Bluetooth Headset.

copyFrom() needs to check for the introduced bit too.
2010-08-23 17:04:32 -07:00
Gilles Debunne
b037da401a am 3e05a0be: Hysteresis effect in Text selection.
Merge commit '3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp

* commit '3e05a0beb2fad0b21558019d2adf6805da70e10e':
  Hysteresis effect in Text selection.
2010-08-23 15:26:51 -07:00
Gilles Debunne
3e05a0beb2 Hysteresis effect in Text selection.
Vertical movement requires going over a given threshold to change line.
Makes it easier to move down without changing line, so that one can see the
cursor better. Also simplifies long line selection.

Change-Id: I791da500232c6e510af64c637ed994c5da9a4fea
2010-08-23 15:20:53 -07:00
Wink Saville
8da31dc8bf Merge "Allow reliable detection of a message that is in use." 2010-08-23 15:00:23 -07:00
Mathias Agopian
0c76c7c5ee Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread 2010-08-23 13:54:17 -07:00
Chet Haase
4addc005ae Merge "Adding animation facilities to simplify layout transitions" 2010-08-23 13:54:07 -07:00
Jaikumar Ganesh
7f656e0961 Merge "Add Tethering class bit check." 2010-08-23 13:22:38 -07:00
Chet Haase
602e4d3824 Adding animation facilities to simplify layout transitions
Change-Id: I70992a0dff6a75727f51abcfdfc7d7f2c2a8c101
2010-08-23 13:01:06 -07:00
Vasu Nori
81b5db042b Merge "weird java bug. bug:2941509" 2010-08-23 12:41:35 -07:00
Gilles Debunne
27113f8646 Merge conflict due to wrong import paths.
Change-Id: I3bba20b26036de53b29bb0b30885fe33832ba3e3
2010-08-23 12:09:14 -07:00
Vasu Nori
9a8bc78da7 weird java bug. bug:2941509
Change-Id: I70edabbdb5c715018227958b74fa1ac4e4df3f88
2010-08-23 12:07:00 -07:00
Jeff Brown
a931e9a158 am 6bacd9c6: am 2f6d975b: Minor MotionEvent optimization.
Merge commit '6bacd9c6fb799f185be580a0596214b0ce998999'

* commit '6bacd9c6fb799f185be580a0596214b0ce998999':
  Minor MotionEvent optimization.
2010-08-23 12:01:46 -07:00
Jaikumar Ganesh
332058050a Add Tethering class bit check.
Change-Id: Iaa87c91c4b3db3b77c2e6c4f559fa2e438c9c247
2010-08-23 11:50:32 -07:00
Gilles Debunne
5989f4edc5 Merge "resolved conflicts for merge of a842d143 to master" 2010-08-23 11:42:24 -07:00
Adam Powell
6c6f575423 More ActionBar/config change tweaks. Preserve open overflow menus
Change-Id: Ic8ad2b1e3909fbf84ff4d852ae046a9f9508477c
2010-08-23 10:24:49 -07:00
Elliott Slaughter
d62847997b Fix WebView saveState and restoreState for private browsing mode.
Change-Id: Ia254ee853d73e56c6f0a5b7762a1cefc1dad0894
2010-08-23 09:59:10 -07:00
Gilles Debunne
252b36379f resolved conflicts for merge of a842d143 to master
Change-Id: I60bba17630d4a4aff5cb8ac9c8b81a2a1fddcd3b
2010-08-22 11:57:58 -07:00
Wink Saville
6083d81ce4 Allow reliable detection of a message that is in use.
Because the standard Looper.loop code calls Message#recycle it is
imperative that Handler#handleMessage code not attempt to resue
a message it receives. If allowed to do so it will cause bugs that
could be difficult to diagnois.

This change adds Message#flags and uses one bit to reliably detect
a message is in use and throws an error in MessageQueue#enqueueMessage.
This allows early detection of this bug.

Note: This is not new functionality, but the current implementation does
not detect messages that are in use because it uses Message#when != 0
as the detection mechanism. The problem is that a Message#when value of 0
is valid value used to place a message at the front of the queue and is
thus unreliable.

Another option is to change the setting of Message#when in Message#enqueueMessage
so that it is never 0, although that does change subtly a publicly accessible
field.

Yet another option would be to use other fields but all candidates have
similar problems as when in that they are publicly accessible or even
settable such as Message#target.

Change-Id: I2df600537700a3fe206678f38bcae7329751c4e5
2010-08-21 15:32:19 -07:00
Scott Main
385a655b8e am bb8d314b: am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f'

* commit 'bb8d314b6c5ff9b51af29daa687d66dfd996914f':
  docs: add links from widget classes to tutorials
2010-08-21 09:44:53 -07:00
Gilles Debunne
0c0250c851 am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
Merge commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1'

* commit 'bbe5fb2b73172a6b42b3406354a3556bd53916e1':
  Fix for a Resource system bug that displayed the wrong name for missing asset.
2010-08-21 09:44:34 -07:00
Kenny Root
e49564e0f7 am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread
Merge commit '821afa9aec8d3a4ffd2e72ce797d8097eaf13973'

* commit '821afa9aec8d3a4ffd2e72ce797d8097eaf13973':
  Add OBB flags to support overlays
2010-08-21 09:41:12 -07:00
Steve Howard
dfc8cde5c8 am 1f442104: am e0c8582e: Merge "Improve orientation sensing when waking up while flat." into gingerbread
Merge commit '1f4421048206ca1745ddd6366588759c9c5c38f9'

* commit '1f4421048206ca1745ddd6366588759c9c5c38f9':
  Improve orientation sensing when waking up while flat.
2010-08-21 09:40:22 -07:00
Dianne Hackborn
37444f4239 am d172594e: am cf6d2a1d: Merge "Fix issue #2845673: android:exported="false" is not obeyed" into gingerbread
Merge commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b'

* commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b':
  Fix issue #2845673: android:exported="false" is not obeyed
2010-08-21 09:34:43 -07:00
Kevin Powell
7a0541d6b8 add new sensor types for handling gyro data and device orientation
more efficiently.

Change-Id: Ifbcf2caae0865eccf1c9b8060342185c22145a30
2010-08-20 19:24:02 -07:00
Steve Howard
6d895fdbc0 am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf' into gingerbread-plus-aosp

* commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf':
  Make ProgressBar.setVisibility() remotable.
2010-08-20 19:06:23 -07:00
Steve Howard
d2e5f95e0e Merge "Make ProgressBar.setVisibility() remotable." into gingerbread 2010-08-20 19:04:35 -07:00
Dianne Hackborn
727782053c Work on DialogFragment and docs.
- DialogFragment now has an option to not show a dialog, so you can
  use your UI somewhere else.
- Deprecated show() versions that were tied to activities.
- Added documentation to DialogFragment class.
- Added documentation to onSaveInstanceState() to explain how the
  time it is called is different than Activity's version.
- Fixed some java doc warnings.

Change-Id: If026744c368e2443030d2d9e0a9c808d820857df
2010-08-20 18:32:41 -07:00
Jean-Baptiste Queru
c64b916ef5 resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp
Change-Id: I8001a95f8c44ef0343e0a50de4bd5b5a85d41c38
2010-08-20 18:19:03 -07:00
Christian Mehlmauer
e7731f0a7f Added overload methods for DatabaseUtils.queryNumEntries
Now you can filter the count statement with a selection
and selection args
UnitTests for this new methods are added to the cts project

Change-Id: Id9233aec0eaac08839041ae7cbaba203470ad3d8
2010-08-20 18:02:09 -07:00