107698 Commits

Author SHA1 Message Date
Scott Main
90a603147a am bf0abee6: am b4825b0e: am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldp
* commit 'bf0abee6ce8a5f4e7785efd7319cbf36b820d596':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:12:15 -07:00
Scott Main
bf0abee6ce am b4825b0e: am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and includ
* commit 'b4825b0e55b71ff0aca96a560802f3355e3db5a7':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:09:56 -07:00
Scott Main
b4825b0e55 am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version,
* commit 'c090ce8c6f0d8c4fc176be4bb182548f11a3a13e':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:07:14 -07:00
Scott Main
c090ce8c6f am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya k
* commit 'c51315674f27a12840c9e12d1ec7e0006bdba054':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:05:37 -07:00
Scott Main
c51315674f am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony."
* commit '2d312a987aa768c148c16742d6ad622279fb6e42':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
2013-06-06 12:04:03 -07:00
Scott Main
2d312a987a Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony." into jb-mr1.1-ub-dev 2013-06-06 19:02:41 +00:00
Dianne Hackborn
5d25b18ec8 Merge "Improve debug printing in activity manager." 2013-06-06 19:01:13 +00:00
Craig Mautner
658b07f38c Merge "Make WindowState mUnderStatusBar reflect position." 2013-06-06 18:28:57 +00:00
Craig Mautner
d76dcdcd98 Make WindowState mUnderStatusBar reflect position.
The mUnderStatusBar variable was always true but now it changes
when the StackBox is no longer directly under the Status Bar.

Change-Id: I0c9db5790bfa9b0e4bb35e389d539fd941d56730
2013-06-06 11:26:15 -07:00
Alan Viverette
4ea7b1c3d5 Fix mistake in current APIs.
Change-Id: I5f41108a2c28169c0a5433993fea5bb1b6037c5a
2013-06-06 11:06:38 -07:00
Dianne Hackborn
7ad34e5fb2 Improve debug printing in activity manager.
Dumping per-package data is now much cleaning, and only really
prints information related to the package.  Also clean up the
formatting and such of the new activity stack states.

Change-Id: Ie5f31d72b7e77b34fd9acd835f28ed1db1dff328
2013-06-06 11:05:50 -07:00
John Spurlock
a7588e63ca Merge "Remove a few non-public dependencies." 2013-06-06 18:00:31 +00:00
Joe Malin
195c32f774 am 7b34346d: am a2425f68: Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev
* commit '7b34346d483f41c1a7b444299903017c9d69eb6d':
  Doc bug B9297954: Fixes to Location APIs
2013-06-06 10:55:44 -07:00
Joe Malin
7b34346d48 am a2425f68: Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev
* commit 'a2425f6825a88fb04f3a22e018311bf2e2a5ac4e':
  Doc bug B9297954: Fixes to Location APIs
2013-06-06 10:53:36 -07:00
Dirk Dougherty
6861c488bc am 36631b44: am 758cedd1: am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '36631b44f27af76e1fbd3def4b50b2cad9db0ecf':
  Doc change: fix broken link to localization checklist.
2013-06-06 10:51:57 -07:00
Dirk Dougherty
36631b44f2 am 758cedd1: am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '758cedd116f1c6ea4b8b936a76cd77d592868209':
  Doc change: fix broken link to localization checklist.
2013-06-06 10:50:04 -07:00
Joe Malin
a2425f6825 Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev 2013-06-06 17:49:27 +00:00
Dirk Dougherty
758cedd116 am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit 'f14698551aeb57dc1952413480cb72a0c8ffb620':
  Doc change: fix broken link to localization checklist.
2013-06-06 10:47:34 -07:00
Dirk Dougherty
f14698551a am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '86927797869512f87e0ba6be5b83564e4a773b71':
  Doc change: fix broken link to localization checklist.
2013-06-06 10:46:14 -07:00
Dirk Dougherty
8692779786 am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit 'cf35c5e35d15f9ced64e739bd216dae7d0cbd8ae':
  Doc change: fix broken link to localization checklist.
2013-06-06 10:43:34 -07:00
Dirk Dougherty
cf35c5e35d am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '497584edbacb15b174901da21bc94f37528ac7d1':
  Doc change: fix broken link to localization checklist.
2013-06-06 10:41:45 -07:00
Dirk Dougherty
497584edba am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs
* commit '16fdbd1729e9473f6176c88c59538fc5c371154f':
  Doc change: fix broken link to localization checklist.
2013-06-06 10:39:22 -07:00
The Android Open Source Project
fdb2213db4 am 3fbf896c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '3fbf896c1f194c37bb49d753d7f30367a9a9c43f':
  Maybe fix issue #9296868: Crash in system process
  Fix regression in long-press home behavior on tablets.
  Import translations. DO NOT MERGE
  Create missing Uids when recording network stats.
  Import translations. DO NOT MERGE
2013-06-06 10:38:59 -07:00
The Android Open Source Project
3fbf896c1f Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7ad4d9cdf2b0e666af7ac5791eb357703900969c
2013-06-06 10:37:18 -07:00
Chet Haase
e2b66ff085 Merge "Fix CrossFade transition" 2013-06-06 17:37:10 +00:00
Alan Viverette
b33d778e9c Merge "Deprecate DrawableStateList.getChildren() and add getChild()." 2013-06-06 17:36:40 +00:00
Dirk Dougherty
16fdbd1729 Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 2013-06-06 17:36:29 +00:00
Chet Haase
71ce4876e5 Merge "Fix crash with LayoutTransition and ViewOverlay collision" 2013-06-06 17:35:24 +00:00
Dirk Dougherty
f4483eca3a Doc change: fix broken link to localization checklist.
Change-Id: I95bb57dcc0afe4ed31f89d9d2e9b31b1a7224bc7
2013-06-06 10:34:40 -07:00
Chris Craik
1e97ceb469 Merge "Support all formats for BitmapFactory.Options.inBitmap" 2013-06-06 16:13:30 +00:00
Craig Mautner
d0d3ca9548 Merge "Replace arrays with ArrayList" 2013-06-06 15:33:03 +00:00
Craig Mautner
8306f87132 Merge "Delay removal of windows from WindowManager" 2013-06-06 15:31:32 +00:00
Craig Mautner
652fdfaf6f Replace arrays with ArrayList
The three arrays were being reconstructed and copied for each add
and each remove. By replacing them with ArrayList only three
constructions total are required. Also, the number of
System.arraycopy() calls is halved.

Change-Id: I0f8def1b517eb1bc5f930fcd5d3d1e0394071f0e

Conflicts:
	core/java/android/view/WindowManagerGlobal.java
2013-06-06 07:51:57 -07:00
Chet Haase
4f0c4672ac Fix CrossFade transition
Small fixes in CrossFade to handle more general situations.
Also, added API to CrossFade to enable different behaviors during
the transition.

Change-Id: I12d17ab8f8f96be370c070373112ad8a62df9115
2013-06-06 07:37:32 -07:00
Craig Mautner
05eb730ca4 Delay removal of windows from WindowManager
When relaunching activities the window manager clears out all windows
by calling a ViewRootImpl.die() in a deferred fashion. Then it
immediately deletes the ViewRootImpl and its view from its list
of windows. When the die() is eventually executed it calls
dispatchDetachedFromWindow() which tries to remove the previously
removed windows causing an Exception to be thrown.

This change waits to remove the windows until after die() has been
completed. Fixes bug 8253030.

Change-Id: I5b41be1c6b776e32128c064267653db98bd95292
2013-06-06 07:32:13 -07:00
Chet Haase
ce08ce539a Fix crash with LayoutTransition and ViewOverlay collision
When a View is added to a ViewGroupOverlay, it must not be parented
in another container. If it is, it will automatically be removed.
This works in general, but if there is a LayoutTransition on the
view's parent, then the actual removal will be delayed until the
transition completes. This means that the call to add(view) in
the ViewGroupOverlay's container will fail and throw an exception because
the view is still parented for the duration of the LayoutTransition.

This fix cancels the running transition to ensure that the view is not
parented prior to adding it to the overlay's container.

Issue #9303245 Crash combo: add(View) and animateLayoutChanges

Change-Id: Id4eaddccf64c353fc77e020882b978cdeb14c0ef
2013-06-06 07:27:53 -07:00
John Spurlock
b8bacccfc1 Remove a few non-public dependencies.
Maps, CharSequences, MotionEvent.copy

Change-Id: I97e15b0f9530623f65e061674bd7ec56d8fefa3e
2013-06-06 09:34:35 -04:00
The Android Automerger
11dc1b3686 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-06 05:55:33 -07:00
kmccormick
ae8f82f201 am cdd271d4: am 38bdf107: am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit 'cdd271d421136593553e3c32aa4b98fc4f5268f3':
  Doc update: Refactoring to client/server.
2013-06-05 18:36:38 -07:00
kmccormick
cdd271d421 am 38bdf107: am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '38bdf107ba0abcce8b87bc87653c73191566d002':
  Doc update: Refactoring to client/server.
2013-06-05 18:33:38 -07:00
kmccormick
38bdf107ba am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '57394e3daff094c28ee2a2fb886e1764a1b7728d':
  Doc update: Refactoring to client/server.
2013-06-05 18:32:23 -07:00
kmccormick
57394e3daf am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '2fbe109466ba582663fdc0f98ff4b9aeeb15ce32':
  Doc update: Refactoring to client/server.
2013-06-05 18:30:19 -07:00
kmccormick
2fbe109466 am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '3ef445a80aea4670855f4cabe8072f16c1ff5128':
  Doc update: Refactoring to client/server.
2013-06-05 18:27:50 -07:00
kmccormick
3ef445a80a am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit '68291f33e03be5180dc5c921d71cafbc83507301':
  Doc update: Refactoring to client/server.
2013-06-05 18:26:16 -07:00
kmccormick
68291f33e0 am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit 'db3158ead35f28ea31a7b6d87c50108cf972a9c0':
  Doc update: Refactoring to client/server.
2013-06-05 18:25:12 -07:00
kmccormick
db3158ead3 Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 2013-06-06 01:22:55 +00:00
kmccormick
f788ac1ab1 Doc update: Refactoring to client/server.
Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b
2013-06-05 18:01:06 -07:00
Craig Mautner
fb7044598b Merge "Extend stacks up under status bar" 2013-06-06 00:28:20 +00:00
Craig Mautner
c5a6e44f59 Extend stacks up under status bar
Retain compatibility with earlier behavior. Fixes bug 8685941.

Change-Id: Ida800a2476ba3a18cd97deccbc65c8a02739d118
2013-06-05 17:22:35 -07:00
Alan Viverette
7214643332 Deprecate DrawableStateList.getChildren() and add getChild().
Moves from exposing the internal structure of a drawable state list
to only exposing the data. Adds getCapacity() and mutate() as
package-private APIs to support various drawable subclasses.

Change-Id: Id08743f979287e1a305f069ccc3c0085a7da6f7b
2013-06-05 17:12:19 -07:00