drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,655 Commits 1 Branch 0 Tags
Commit Graph

14100 Commits

Author SHA1 Message Date
Eric Fischer
2c3eba4c08 Import revised translations. DO NOT MERGE 
Change-Id: Iaa642982ed369b45f0923f919167ccb2e27b72c4
 2010-09-29 14:29:00 -07:00
Doug Zongker
ab9f508292 am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread 
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp

* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
  don't delete /cache/recovery/last_log on boot
 2010-09-29 13:43:28 -07:00
Doug Zongker
981dec695f Merge "don't delete /cache/recovery/last_log on boot" into gingerbread 2010-09-29 13:41:00 -07:00
Romain Guy
e17c054d34 Merge "Add display lists caching." 2010-09-29 13:37:37 -07:00
Romain Guy
b051e895cc Add display lists caching. 
Change-Id: Iac3a248a81ed8cb076a83ef9d186b8ebba685b4c
 2010-09-29 13:29:04 -07:00
Jaikumar Ganesh
c10207b6bf am a5c742bf: Merge "Update local cache before sending intent." into gingerbread 
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp

* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
  Update local cache before sending intent.
 2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
a5c742bfd0 Merge "Update local cache before sending intent." into gingerbread 2010-09-29 13:24:53 -07:00
Doug Zongker
d059055fb3 don't delete /cache/recovery/last_log on boot 
Change-Id: I7739d7a61f4f0d0c2bc6324580404f61d435d716
 2010-09-29 13:22:49 -07:00
Nick Pelly
4715bd91f5 resolved conflicts for merge of f4c3b7e9 to master 
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
 2010-09-29 12:20:51 -07:00
Eric Fischer
97708b19c5 am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp

* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
  Split strings with SD card references into variations.
 2010-09-29 12:17:28 -07:00
Eric Fischer
d77782ed63 Split strings with SD card references into variations. 
Change-Id: I39ead98a753f26c00c1e2ba6344338696263c49b
 2010-09-29 12:09:04 -07:00
Steve Block
9d59429eaa Merge "Update WebView useragent string for merge to WebKit r67908" 2010-09-29 10:42:30 -07:00
Roy West
b4a28f2426 am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
  Partial fix to bug 2992589: Edit dev admin strings.
 2010-09-29 10:40:06 -07:00
Roy West
d146c233c5 Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 2010-09-29 10:37:11 -07:00
Jaikumar Ganesh
2dfe101149 Update local cache before sending intent. 
Change-Id: I0e016cae3070b1811dd68958afb8a8501081097d
 2010-09-29 10:31:02 -07:00
Roy West
7d3d88eec0 Partial fix to bug 2992589: Edit dev admin strings. 
Change-Id: Ifa73e2961fa03b5ac707a73d6932e724931ddb2c
 2010-09-29 10:28:56 -07:00
Steve Block
f5c4e62af8 Update WebView useragent string for merge to WebKit r67908 
Change-Id: If09628fcc8c8e408d3e280f57c534cf87bcc997f
 2010-09-29 17:55:32 +01:00
Owen Lin
0ab9851308 Fix a initialization bug in BitmapRegionDecoder. 
Change-Id: I6c1151fd34970a84d4de52d664d9a5dc464892c5
 2010-09-29 23:12:44 +08:00
Kenny Root
8bd545ab4f am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread 
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
 2010-09-29 07:53:06 -07:00
Kenny Root
212d81a004 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
Kenny Root
f1121dc1d3 Move all the permissions check up for unmount 
We have already scanned the state of the OBB in mountObb, so check the
caller against the stored state in the unmountObb call. This allows us
to ensure the calling binder is the same one that mounted it since we
tie the lifecycle of the OBB to the lifecycle of the binder.

Change-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45
 2010-09-29 07:38:55 -07:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration 
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
 2010-09-28 22:40:18 -07:00
Nick Pelly
038cabe024 NFC integration 
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-09-28 22:36:27 -07:00
Jaikumar Ganesh
3f03496ad9 Update code for new BT APIs. 
Change-Id: I53aa17b6c2a5ee50d47df91960a7f997eb7b1107
 2010-09-28 20:02:12 -07:00
Jaikumar Ganesh
96a79830ea Update code for new BT public APIs. 
Change-Id: Id730fb6226db59f3a0416111c4790653c2fccb0b
 2010-09-28 20:00:53 -07:00
Jaikumar Ganesh
62c37efc9e New public APIs for BluetoothA2dp and BluetoothHeadset profiles. 
Change-Id: I1cc4b109542dfd62473cb95797c8c3d0d15725f4
 2010-09-28 19:53:53 -07:00
Jeff Hamilton
d362391b96 Merge "Add a Settings table to BrowserContract." 2010-09-28 19:15:44 -07:00
Kenny Root
bff405f910 resolved conflicts for merge of d8e8186c to master 
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
 2010-09-28 18:16:50 -07:00
Winson Chung
5553044c19 Merge "Making the calls to the RemoteViewsFactory synchronized to prevent threading issues." 2010-09-28 17:46:39 -07:00
Winson Chung
f58a96152c Making the calls to the RemoteViewsFactory synchronized to prevent threading issues. 
Change-Id: I6efcfb070a9a6cb0467a87a801dfe46c358710f7
 2010-09-28 17:38:13 -07:00
Kenny Root
d8e8186c88 am 05105f7a: Update OBB API to include callbacks 
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
  Update OBB API to include callbacks
 2010-09-28 17:33:47 -07:00
Steve Howard
d58429f9ac Manual merge: Move DownloadManager to android.app 
Changing package at hackbod's request.

Change-Id: I867017b6a9f4684d30c6c5bd1b07f9cabecddb9f
 2010-09-28 17:28:43 -07:00
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