Commit Graph

2363 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
bf9f3ea72e Merge 34afc2cd from gingerbread-plus-aosp
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
2011-01-29 08:45:29 -08:00
Jean-Baptiste Queru
7d4b7dab39 Merge 55e124c4 from gingerbread-plus-aosp
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
2011-01-29 07:32:39 -08:00
Adam Powell
406de58e48 am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
* commit '6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
  Fix bug 3399992 - Make ActionBar menu text styleable
2011-01-28 14:01:06 -08:00
Adam Powell
6b2fda9f4b Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 2011-01-28 13:58:28 -08:00
Joe Onorato
b940659f41 am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:43:17 -08:00
Adam Powell
55f3af27ed Fix bug 3399992 - Make ActionBar menu text styleable
Change-Id: Ic67d167c024332575ca3b79725f012a919146286
2011-01-28 13:42:04 -08:00
Joe Onorato
94eb3d0f7e Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 2011-01-28 13:40:28 -08:00
Dianne Hackborn
6a11185b92 am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
  Fix issue #3398767: Need translucent holo theme
2011-01-27 22:48:32 -08:00
Dianne Hackborn
c8c3021ac3 Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb 2011-01-27 22:46:44 -08:00
Joe Onorato
857fd9b856 Plumb whether an input view is actually visible or not through from the IME
to the status bar.

Bug: 3391067
Change-Id: I049531155bf7ee0b29874916c0b5b0a45b73c09e
2011-01-27 21:19:46 -08:00
Nick Pelly
34afc2cd83 am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
* commit 'd350dc0492fab3614749955f5dcf21ec1c522b24':
  API: Make close() throw an IOException.
2011-01-27 16:26:28 -08:00
Nick Pelly
3fcedf7728 API: Make close() throw an IOException.
IOException on close() can be useful to indicate that in-progress transactions
were canceled.

I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.

Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
2011-01-27 16:17:14 -08:00
Dianne Hackborn
e79b55482e Fix issue #3398767: Need translucent holo theme
Change-Id: I2ce87798ff58315cb96968ab06e5a52da9f35ef8
2011-01-27 15:18:46 -08:00
Vasu Nori
242fa0eb73 am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
* commit 'ce3b35a7b0b80061692d9fa1977cee68b365728c':
  bug:3398527 return List insttead of ArrayList from public API
2011-01-27 15:00:38 -08:00
Nick Pelly
55e124c448 am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread
* commit 'eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
  Clean up MifareUltralight API.
2011-01-27 13:25:52 -08:00
Vasu Nori
ce3b35a7b0 Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb 2011-01-27 12:46:00 -08:00
Nick Pelly
4a5e253220 Clean up MifareUltralight API.
o Some javadoc updates
o writeBlock -> writePages  (Block means something else in NFC Forum).
o validate page offset

Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
2011-01-27 12:22:56 -08:00
Vasu Nori
a017edace7 bug:3398527 return List insttead of ArrayList from public API
Change-Id: Idbdcb59fe860a9168c9ef6c00eb128b05fce84ff
2011-01-27 11:47:28 -08:00
Chet Haase
fcf51a6796 am a45c056e: Merge "Fix display List bugs" into honeycomb
* commit 'a45c056e62be0ca97edbdd6f6660822cf453c886':
  Fix display List bugs
2011-01-26 23:51:58 -08:00
Chet Haase
678e0adbdb Fix display List bugs
Various property setters in View need to invalidate the parent's
cache to get redrawn properly when accelerated with display lists.

Also, fix logic around display lists and old-style Animations in
ViewGroup.

Change-Id: I70e1c2fa49e62228ee4a1301a006ce50bda4c305
2011-01-26 22:44:52 -08:00
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
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
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
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
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
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
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
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
bdd265ba5f resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -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
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
b0cae14175 Merge commit '446aea40' into manualmerge
Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975
2011-01-24 16:31:38 -06: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