Commit Graph

16870 Commits

Author SHA1 Message Date
Kenny Root
05105f7abe Update OBB API to include callbacks
Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
2010-09-28 17:23:26 -07:00
Adam Powell
c49c17314d Added AlertDialog.Builder#getContext
Change-Id: Ic3033a4eff67f507aa39dacfc4c8984a9ee142c1
2010-09-28 17:13:31 -07:00
Winson Chung
3a5dd9c83e Merge "Being more judicious in resetting meta data for the RemoteAdapter." 2010-09-28 15:52:26 -07:00
Jeff Hamilton
a2f9266075 Add a Settings table to BrowserContract.
It contains global settings that are shared
between the Browser app and the sync adapters.

Change-Id: I294ad8b03a44686858fc61a3ae6bbab86f124f99
2010-09-28 16:41:10 -05:00
repo sync
556547dde9 Merge "focus issues" 2010-09-28 14:22:11 -07:00
Vasu Nori
6dcad82332 Merge "SQLiteDatabase: fix inconsistent locking" 2010-09-28 13:39:03 -07:00
Vasu Nori
2467561ac2 SQLiteDatabase: fix inconsistent locking
Synchronized blocks should never call lock() or any operation that
does it. otherwise, bugs like bug:3032897 will occur.
Remove synchronization on all methods in SQLiteStatement
and SQLiteProgram because the caller is supposed to
do the synchronization if the same SQLiteStatement or
SQLiteQuery (which extends SQLiteProgram) object
is used by more than one thread at the same time.
(documentation on SQLiteStatement, SQLiteProgram
mentions this note)

Change-Id: Ifd6ee94d743c38c187e2eb778c57076da7a15073
2010-09-28 13:38:14 -07:00
Andy Stadler
8aeeda9123 am cb6f29eb: am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread
Merge commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f'

* commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f':
  Allow touch events when clickable *or* longClickable
2010-09-28 13:20:05 -07:00
repo sync
6a81b8271d focus issues
1.  Don't bring up the keyboard if we're iconified by default
2.  Also override onRequestFocusInDescendants to return false.  This makes it so that we don't focus on the search edit text which is in the actionbar.

Change-Id: I345e9cd77f686f13762a20454a76ff1f7c4a5556
2010-09-28 13:02:07 -07:00
Gilles Debunne
0d0dc6a70c am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp

* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
  New assets. DO NOT MERGE>
2010-09-28 13:00:32 -07:00
Winson Chung
61ac7e3b36 Being more judicious in resetting meta data for the RemoteAdapter.
- Also adding more error checking when we go to apply the RemoteViews

Change-Id: Id7b13f390cc8ff08fdf8d96cf6bdc5668bf4f2f0
2010-09-28 12:58:29 -07:00
Gilles Debunne
d9743af92e Merge "New assets. DO NOT MERGE>" into gingerbread 2010-09-28 12:56:54 -07:00
Steve Howard
9d9719c44a am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
2010-09-28 12:41:42 -07:00
Steve Howard
5bdb89d7ac Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 2010-09-28 12:38:15 -07:00
Gilles Debunne
01d0efde2d New assets. DO NOT MERGE>
lock screen, and various status bar icons.

Change-Id: I3b76ac45ba31f2b2141bff64bfcae26f6963863f
2010-09-28 11:58:27 -07:00
Adam Powell
975c235b94 No action bars for default holo dialog theme
Change-Id: If02cbc5312d161f38df998c2ef136b00f41d62b0
2010-09-28 11:54:50 -07:00
Romain Guy
a2a57aa02b Merge "Display the correct expected name when loading the wrong adapter." 2010-09-28 10:35:09 -07:00
Romain Guy
5a86c4c385 Display the correct expected name when loading the wrong adapter.
Bug #3042860

Change-Id: I5533c6b99a6aa69e05b6acf8f140b64ee5ea02f0
2010-09-28 10:33:37 -07:00
Andy Stadler
cb6f29ebc6 am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread
Merge commit 'a16682b5e8ed635910eada23272ba6548922c02e' into gingerbread-plus-aosp

* commit 'a16682b5e8ed635910eada23272ba6548922c02e':
  Allow touch events when clickable *or* longClickable
2010-09-28 10:06:27 -07:00
Andy Stadler
a16682b5e8 Merge "Allow touch events when clickable *or* longClickable" into gingerbread 2010-09-28 09:26:49 -07:00
Mattias Larsson
cd4e427980 Hold partial wakelock during shutdown to avoid entering sleep
The ShutdownThread can get suspended while in progress if the
device enters sleep by the user pressing the power-key, or if it is
started (in sleep) from the BatteryService upon a dead battery
notification. If the device is woken up before the battery is
drained, the ShutdownThread will resume and finally complete
the shutdown, but if not the phone will stay in sleep until the
battery level is so low that the power is ruthlessly cut.

Change-Id: If64429fd0c98a9136141942be6c337b5c79cf4f1
2010-09-28 16:40:20 +02:00
Leon Scroggins
f2e17a8683 Hide the soft keyboard when a textfield is blurred.
Bug: 2953257

Requires a change to external/webkit

Change-Id: I8ca82dc7cb6bc1494400f5e5c38050023c94a513
2010-09-28 10:04:50 -04:00
Steve Block
5c23ebadd4 Update the storage locations used by the Chromium HTTP stack
This updates the strorage locations to better match those used by the
Android HTTP stack.

The corresponding external/webkit change is
https://android-git.corp.google.com/g/70643

Bug: 3039536
Change-Id: Ia7ea68d1472e96788a7fbaa6e8f7aa1ee51b3fb0
2010-09-28 12:32:05 +01:00
Adam Powell
1d9fc8c504 Merge "Temporary hack to make context menu text visible on holo dialogs." 2010-09-27 23:17:34 -07:00
Adam Powell
e4679f1ed2 Temporary hack to make context menu text visible on holo dialogs.
Real fix for this to come. MenuBuilder needs to not hardcode themes
and dialogs shouldn't either.

Change-Id: I393969acd1ef6956d7299cb2eff46708ce812d1d
2010-09-27 23:12:39 -07:00
Adam Powell
81eeecc305 Merge "Fix some text styling for Holo.Light" 2010-09-27 22:29:15 -07:00
Adam Powell
385fe872ab Fix some text styling for Holo.Light
Change-Id: Ia082c12b2b0cef044170ba92e9f837bd38516c8e
2010-09-27 22:26:03 -07:00
Winson Chung
4d5a8b5587 am 55ee8f93: am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'

* commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
2010-09-27 21:03:17 -07:00
Kenny Root
cc8f44bc81 am e7dd4e38: am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d'

* commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d':
  Use buffered I/O during certificate parsing
2010-09-27 20:32:56 -07:00
Dianne Hackborn
64bbbb471e resolved conflicts for merge of a8bce7c8 to master
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
2010-09-27 20:25:20 -07:00
Vasu Nori
9b8a51e9d3 Merge "fix this: closing database twice fails with IllegalStateException" 2010-09-27 18:29:18 -07:00
Vasu Nori
587423afb5 fix this: closing database twice fails with IllegalStateException
Change-Id: Idda35e49d539845099b377872f9a6f0e0caa4626
2010-09-27 18:26:25 -07:00
Dianne Hackborn
cca1f0e347 Allow all apps to call ContentResolver.getType().
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
2010-09-27 18:05:44 -07:00
Steve Howard
31fd85f39b Move DownloadManager to android.app (DO NOT MERGE)
Changing package at hackbod's request.  I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.

Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
2010-09-27 17:12:47 -07:00
Adam Powell
c63806d852 Holo themes and assets in progress
Change-Id: Ic10480dc1c771d0ccd10f1d4014c945480fd6c0d
2010-09-27 17:10:30 -07:00
Irfan Sheriff
1beeab70a2 Merge "use hostname when address null ProxyProperties parcelling" 2010-09-27 16:24:23 -07:00
Gilles Debunne
4e9243d55c am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp

* commit '8d7057df401af668335c38273bc62872e4dbf538':
  Updated assets in status bar. DO NOT MERGE.
2010-09-27 16:17:28 -07:00
Gilles Debunne
8d7057df40 Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Gilles Debunne
c49b259a62 Updated assets in status bar. DO NOT MERGE.
Unlock has a 1 pixel offset that has to be fixed by code.

dropdown untested on device.

Most of these should be removed from SystemUI (revert 68833).

Pass 4.

Change-Id: Ibbbe4cc404151ec28768af98509082d77b303abe
2010-09-27 15:56:26 -07:00
Joe Onorato
710e049a6e Merge "Hide the "Clear all" button in the notification panel if there are no clearable notifications." 2010-09-27 15:54:55 -07:00
Andy Stadler
b34fd1ff5c Allow touch events when clickable *or* longClickable
This matches more closely the behavior or View.onTouchEvent()

Bug: 3036477
Change-Id: I8a9135da7f9aeeb1e0537dce15295049013a0243
2010-09-27 15:51:09 -07:00
Joe Onorato
5dd1169ae9 Hide the "Clear all" button in the notification panel if there are no clearable notifications.
Change-Id: I7145036724939220e1f23fb91c62027b28663c20
2010-09-27 15:34:04 -07:00
Winson Chung
55ee8f9329 am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp

* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
2010-09-27 15:08:57 -07:00
Winson Chung
44e8ff9924 Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Change-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9
2010-09-27 15:04:43 -07:00
Eric Fischer
7063eb1046 am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp

* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
  Trim unwanted whitespace from translations.  DO NOT MERGE
2010-09-27 15:04:35 -07:00
Eric Fischer
dc36da5148 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Eric Fischer
eb2746a152 Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I39809e844c12e283f2ed65b8fc5a6fbe14311071
2010-09-27 14:41:54 -07:00
Jeff Brown
464fb74e28 am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919'

* commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
  Add suuport for splitting touch events across windows.
2010-09-27 14:40:38 -07:00
Joe Onorato
6d3ed72bf2 am 761427f8: am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread
Merge commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268'

* commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268':
  We only need at most one tty icon.
2010-09-27 14:38:37 -07:00
Gilles Debunne
63555e36c9 am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp

* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
  Revert previous status bar assets. DO NOT MERGE.
2010-09-27 14:32:06 -07:00