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

2701 Commits

Author SHA1 Message Date
Kenny Root
1f8e2f9958 am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb 
* commit '5d506fa7274e8ba84e348e11c22729b58802f796':
  Add API for preferred Launcher icon size and density
 2011-01-26 21:15:28 -08:00
Kenny Root
5ef44b7566 Add API for preferred Launcher icon size and density 
Applications that create an icon for launcher to use couldn't determine
which size or density the icon should be created.

Bug: 3224340
Change-Id: Iee96113a4092696a9bd18eecbd2593b38f952a16
 2011-01-26 19:43:27 -08:00
Winson Chung
dd071fea23 am 38fe6ff4: am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb 
* commit '38fe6ff45a6cbc328d1b92c9b9d79c65c3fb29ae':
  Re-enabling queued unbinding of services after requests to the service. (3394210)
 2011-01-26 12:35:21 -08:00
Winson Chung
38fe6ff45a am 2c070bae: Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb 
* commit '2c070bae4493cd1976c5086ec4cbf6ce10482742':
  Re-enabling queued unbinding of services after requests to the service. (3394210)
 2011-01-26 12:32:50 -08:00
Winson Chung
2c070bae44 Merge "Re-enabling queued unbinding of services after requests to the service. (3394210)" into honeycomb 2011-01-26 12:30:26 -08:00
Winson Chung
16c8d8a558 Re-enabling queued unbinding of services after requests to the service. (3394210) 
- Fix for crash when detaching from window
- Potential fix for occasional IllegalStateException when updating List based widgets

Change-Id: I3d3f2bb691552a1136111043db686c4926b510c6
 2011-01-26 12:09:27 -08:00
Joe Onorato
b648c60854 am a4a5ec5e: am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb 
* commit 'a4a5ec5e748f99c40301c9c422b3d36cb44c6081':
  Expose the window flags for lights out mode.
  Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
  Make FLAG_FULLSCREEN not go into lights out mode anymore.
 2011-01-26 11:50:38 -08:00
Joe Onorato
a4a5ec5e74 am 1aadb210: Merge changes I48392c75,Id09437a4,I4a0aa878 into honeycomb 
* commit '1aadb2108d7614d9d1ff61b41c6c31cb8d211ab9':
  Expose the window flags for lights out mode.
  Make TabletStatusBar call into StatusBarManagerService when it goes out of lights out mode on its own.
  Make FLAG_FULLSCREEN not go into lights out mode anymore.
 2011-01-26 11:48:48 -08:00
Joe Onorato
14782f705e Expose the window flags for lights out mode. 
I hadn't wanted to do this, but it makes porting the FLAG_FULLSCREEN
stuff over to this simpler because you don't have to go find a view
to proxy through.

This change also clears the flag everywhere when the window manager
notifies the views that the change has come back.

Change-Id: I48392c7550925bcca50c5bb9e1f263e99de6c7bc
 2011-01-26 10:47:39 -08:00
Jeff Hamilton
71208ce454 resolved conflicts for merge of ca36d863 to honeycomb-merge 
Change-Id: Idb00dc86e265b2aaed8852912e1f9d8659fd2835
 2011-01-26 11:27:51 -06:00
Dianne Hackborn
0793749661 am b8fc8c26: am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 
* commit 'b8fc8c26cba829225469a65bf8e35b06de54588e':
  Change AsyncTask.execute() back to using a thread pool...
 2011-01-25 22:09:50 -08:00
Dianne Hackborn
b8fc8c26cb am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 
* commit '4fbca2b6138c52405fd7fb241bbf3c21fddd04bb':
  Change AsyncTask.execute() back to using a thread pool...
 2011-01-25 22:08:16 -08:00
Dianne Hackborn
4fbca2b613 Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb 2011-01-25 22:05:38 -08:00
Dianne Hackborn
96438cd658 Change AsyncTask.execute() back to using a thread pool... 
...for now.

Change-Id: I1fe64f3e3a575f85add11dfe4d405f0c3a4a49de
 2011-01-25 21:42:37 -08:00
Adam Cohen
27d209f94a am 7975d8c0: am 0f16477b: Merge "Cleaning up StackView" into honeycomb 
* commit '7975d8c0fec80cb39365cf5cbad4223c5847384f':
  Cleaning up StackView
 2011-01-25 20:23:22 -08:00
Adam Cohen
7975d8c0fe am 0f16477b: Merge "Cleaning up StackView" into honeycomb 
* commit '0f16477b2d2432a294801a12ac513cd41b00d03c':
  Cleaning up StackView
 2011-01-25 20:20:45 -08:00
Adam Cohen
0f16477b2d Merge "Cleaning up StackView" into honeycomb 2011-01-25 20:19:17 -08:00
Adam Cohen
78db1aa911 Cleaning up StackView 
Change-Id: I38cd8a5f2d25973d3f97551be0a873ca35044ed9
 2011-01-25 17:09:34 -08:00
Jeff Hamilton
505be50d32 am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '95f7c8549928c0b383b3b3651224ded6b05a2f51':
  Use classnames instead of ints for NFC techs.
 2011-01-25 16:21:28 -08:00
Dianne Hackborn
7f13e47620 am 1a904ded: am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb 
* commit '1a904dedbb5a15b3e60cac0fab83a3734701aff6':
  New extra for GET_CONTENT.
 2011-01-25 16:19:48 -08:00
Jeff Hamilton
f0b7977f68 am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread 
* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
  Fix the build, proper current.xml.
 2011-01-25 16:15:58 -08:00
Nick Pelly
30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge 
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
 2011-01-25 16:13:17 -08:00
Jeff Hamilton
978afba57c Fix the build, proper current.xml. 
Change-Id: I9b02206042c74fd5c329fe2b70ed2b6b91d41382
 2011-01-25 18:10:58 -06:00
Jeff Hamilton
437ff39c74 resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp 
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
 2011-01-25 18:00:41 -06:00
Dianne Hackborn
1a904dedbb am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb 
* commit '8fca2eccb03b9b8d71ec4a7ec088d617edec4e73':
  New extra for GET_CONTENT.
 2011-01-25 15:19:17 -08:00
Dianne Hackborn
c4d0e6fcea New extra for GET_CONTENT. 
Change-Id: Ib367c02619ee301d9651dd70d35f7d57aa8a0cbc
 2011-01-25 15:16:55 -08:00
Jeff Hamilton
eb645a15b9 am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread 
* commit 'f126ad3b6484ef62eed202f1f49cc4557c0a3848':
  Use classnames instead of ints for NFC techs.
 2011-01-25 14:41:55 -08:00
Jeff Hamilton
d88e9aa575 Use classnames instead of ints for NFC techs. 
This makes the system more flexible and allows
adding new technology types without having to
update the API.

Change-Id: Iaee6b633965e501a70e8afc3f1d54d9d94a4d05a
 2011-01-25 16:32:26 -06:00
Vasu Nori
4d724546e4 Merge "add extra prams to intent to start Download App in sort-by-size mode" 2011-01-25 12:50:27 -08:00
Jeff Hamilton
4f1b04ac47 resolved conflicts for merge of 0aea1836 to honeycomb-merge 
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
 2011-01-25 14:35:55 -06:00
Vasu Nori
e5f92249f1 add extra prams to intent to start Download App in sort-by-size mode 
Change-Id: Icedf50477681bc79582517500748b9a916121903
 2011-01-25 11:49:30 -08:00
Nick Pelly
cf1f20e701 am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp 
* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
  Add operands to mifare classic increment, decrement.
 2011-01-25 10:30:11 -08:00
Nick Pelly
fd06cc10ac resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp 
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
 2011-01-25 10:26:54 -08:00
Nick Pelly
866264fa26 am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aosp 
* commit 'bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a':
  Make MifareClassic methods more consistent.
 2011-01-25 10:22:41 -08:00
Nick Pelly
bdd265ba5f resolved conflicts for merge of 12619677 to honeycomb-plus-aosp 
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
 2011-01-25 10:20:02 -08:00
Dianne Hackborn
1563966ca0 am 98d169ea: am 5d9d03a0: Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException... 
* commit '98d169eacd65e6278bb8eab354f0278065771e9f':
  Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
 2011-01-24 22:31:26 -08:00
Dianne Hackborn
98d169eacd am 5d9d03a0: Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException... 
* commit '5d9d03a0234faa3cffd11502f973057045cafe82':
  Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException...
 2011-01-24 22:12:36 -08:00
Dianne Hackborn
5d9d03a023 Maybe fix issue #3093599: java.lang.IndexOutOfBoundsException... 
...Invalid index 0, size is 0 at
android.app.ActivityThread.performPauseActivity(ActivityThread.java:2326)

It looks like if an arrow key is dispatched between the time the
list view is told its data set has changed and it does the resulting
layout pass, we could try to move the position to a now invalid
index.  This may prevent that from happening.

Also put in a better error message if saving state of a fragment
whose target is no longer in the fragment manager.

And fix a bug in PackageManager where we could return a null from
queryIntentActivities().

And add a new API to find out whether a fragment is being removed,
to help fix issue #3306021: NPE at
android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)

Next, for new HC apps we can delay committing data to
storage until the activity is stopped.

Finally, use the new multi-threaded AyncTask executor in a few
places, so we don't have worked blocked by long-running tasks from
the application.

Change-Id: I27b2aafedf2e1bf3a2316309889613fa539760f3
 2011-01-24 21:23:03 -08:00
Andy Stadler
d532ab13dc am 2a9deb0d: am 315fae20: Merge "Throw Base64DataException instead of IOException" into honeycomb 
* commit '2a9deb0d40c4c34930a8313074161b846099c7fc':
  Throw Base64DataException instead of IOException
 2011-01-24 17:48:23 -08:00
Andy Stadler
2a9deb0d40 am 315fae20: Merge "Throw Base64DataException instead of IOException" into honeycomb 
* commit '315fae2028d4ef73c9ba094a71152e6e853e2690':
  Throw Base64DataException instead of IOException
 2011-01-24 17:46:33 -08:00
Andy Stadler
c5a0ce242f Throw Base64DataException instead of IOException 
* Define Base64DataException
* Throw it from Base64InputStream & Base64OutputStream
* This enables callers to disambiguate "bad data" from "broken stream",
  which makes it more possible to do proper retry logic.

Bug: 3365205
Change-Id: I332e7c008f92b333400d1b4dcaef5aedc7c10ef4
 2011-01-24 16:47:56 -08:00
Jeff Hamilton
ff4e6f58d6 am 0ccac6e3: Merge "Merge commit \'446aea40\' into manualmerge" into honeycomb-plus-aosp 
* commit '0ccac6e3ee687930d411be69b3bb6904656d128d':
  API changes for NFC.
 2011-01-24 14:34:46 -08:00
Jeff Hamilton
b0cae14175 Merge commit '446aea40' into manualmerge 
Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
 2011-01-24 16:31:38 -06:00
Joe Onorato
b05aacc1ae am ab8967ae: am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb 
* commit 'ab8967ae9db71291094da2967e744038b7e91ff7':
  Remove unwanted parameter (it was a typo).
 2011-01-24 13:30:42 -08:00
Joe Onorato
10f4126a36 resolved conflicts for merge of faf083ef to master 
Change-Id: I316a1b4356f6dba6c3880ccb02dbb2fa00d21a85
 2011-01-24 13:16:08 -08:00
Joe Onorato
ab8967ae9d am da34e13b: Merge "Remove unwanted parameter (it was a typo)." into honeycomb 
* commit 'da34e13bb4ef97832c43489937a26d314437a1d7':
  Remove unwanted parameter (it was a typo).
 2011-01-24 11:16:43 -08:00
Joe Onorato
e595cad6ee Remove unwanted parameter (it was a typo). 
Bug: 3241144
Change-Id: I569f6c8dffb17041a422be6084b6eab89624a57b
 2011-01-24 09:25:35 -08:00
Joe Onorato
faf083ef0b am 4c541b13: Merge "visibility ("lights out") API." into honeycomb 
* commit '4c541b1303b0ee2b9b0d19bee85d3780c5c4c110':
  visibility ("lights out") API.
 2011-01-23 23:36:57 -08:00
Nick Pelly
0065f398c1 am c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread 
* commit 'c896d85c15d8a6c98c93df57d88481b89eb878f5':
  Add operands to mifare classic increment, decrement.
 2011-01-23 22:14:54 -08:00
Nick Pelly
1e233af3a7 Add operands to mifare classic increment, decrement. 
Change-Id: Ib35f615142bda48a5e33888a09ebae2880624788
 2011-01-23 22:11:44 -08:00