107780 Commits

Author SHA1 Message Date
Craig Mautner
6a7e5c28a4 Merge "Dismiss immediately to maintain consistent state." 2013-06-10 19:21:27 +00:00
Ashish Sharma
2983acc008 Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" 2013-06-10 19:05:28 +00:00
Craig Mautner
92098c7c30 Dismiss immediately to maintain consistent state.
Fix bug introduced by deferring nulling of mParent.

In dismissDialog the removal was being put on a queue while the
state of the Dialog was being updated immediately. This meant that
if a show() was called before the remove was executed it would try
and add the DecorView a second time. Boom!

Fixes bug 9370301.

Change-Id: I576d1e207c786bc2e21dfd40cb94f2b63a020fe2
2013-06-10 11:39:21 -07:00
Ashish Sharma
4970974d74 Do not allow 0 or smaller periodicity for syncs.
b/9295383

Change-Id: I5f758f4a033d74e42a04b214a6b70b94d394280d
2013-06-10 11:29:37 -07:00
Romain Guy
f38fd87844 am 7a6e1297: am 8d8fc469: Merge "Don\'t orphan footers with transient state Bug #8725945" into jb-mr2-dev
* commit '7a6e129759672f0c1b0ce462d389c0f469e7348f':
  Don't orphan footers with transient state Bug #8725945
2013-06-10 11:12:09 -07:00
The Android Open Source Project
b2765e7d9a am b72a2204: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'b72a2204113804855d4e64c8e8f5f1d1598c7f50':
2013-06-10 11:11:55 -07:00
Kenny Root
3606254a50 resolved conflicts for merge of e96a8207 to master
Change-Id: I90801b35ed0c00078a47faadc7fbb05d2e5fe381
2013-06-10 11:09:28 -07:00
Romain Guy
7a6e129759 am 8d8fc469: Merge "Don\'t orphan footers with transient state Bug #8725945" into jb-mr2-dev
* commit '8d8fc469952ffe3feb45e52388f2129f8dd5e40c':
  Don't orphan footers with transient state Bug #8725945
2013-06-10 10:26:57 -07:00
Romain Guy
8d8fc46995 Merge "Don't orphan footers with transient state Bug #8725945" into jb-mr2-dev 2013-06-10 17:23:25 +00:00
The Android Open Source Project
b72a220411 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I40b8952e805164e6d984273872241dc6be2ad80a
2013-06-10 08:13:45 -07:00
The Android Automerger
f4a87a6ff1 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-10 05:55:18 -07:00
Jeff Sharkey
e96a820771 am 56cd646a: Avoid logging sensitive data.
* commit '56cd646abeae51e806791f82ab0995fe047b1fe4':
  Avoid logging sensitive data.
2013-06-09 19:07:48 -07:00
The Android Automerger
8a63b45803 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-09 05:55:38 -07:00
Romain Guy
b7e0f7942b Don't orphan footers with transient state
Bug #8725945

Selecting text in an EditText causes the View to have transient
state. This would in turn cause the View to be removed from its
ListView parent. When removed, the EditText would lose its
AttachInfo, causing all sorts of problems. Headers and footers
must not be removed, only detached. This is the part of the fix
in AbsListView.

Fixing AbsListView triggered a second bug: when a View is removed
from the Window manager, it would keep its parent assigned, thus
making it impossible to add it again to the window manager. When
a ViewRootImpl goes through doDie(), it must set its content view's
parent to null to properly cleanup.

Change-Id: I0489daa74f8f7fcf85526f0928f8925ec30d4f42
2013-06-07 15:36:49 -07:00
Jeff Sharkey
56cd646abe Avoid logging sensitive data.
When building commands to send across NativeDaemonConnector, scrub
sensitive arguments to prevent them from being logged.

Bug: 8609800
Change-Id: I84b16791749264a010f7e59f9918f68d71bac6b9
2013-06-07 15:09:32 -07:00
Dianne Hackborn
be4e6aaa02 Initial super-primitive process tracker.
The goal of this is to keep track of what app processes
are doing, to determine who is being abusive, when the system
is getting into memory constrained situations, and help the
user determine how to resolve this.

Right now it doesn't really do any of that, just keeps track
of how long every process has been running since boot.

Also update the activity manager to use "cached" as the terminology
for what it used to interchangeably call hidden and background
processes, and switch ProcessMap over to using ArrayMap.

Change-Id: I270b0006aab1f38e17b7d9b65728679173c343f2
2013-06-07 15:09:17 -07:00
Romain Guy
2df804462b Merge "Fix the build" 2013-06-07 21:54:47 +00:00
Romain Guy
28323a425f Fix the build
Change-Id: I506b24e2228d49badc513fdd839671ba50bb2faf
2013-06-07 14:54:01 -07:00
Eino-Ville Talvala
b2675542c2 Initial commit of new camera API, mostly just the interface.
- New core API classes in android.hardware.photography
- android.media.Image and android.media.ImageReader classes for
  application access to direct hardware image buffers.
- Additions to android.graphics.ImageFormat to describe new image
  types needed by new camera API.
- Some documentation included; very little implementation.

Bug: 9111736
Change-Id: I0680f35944d1cb8845b7dc0c67edc8c0f0864573
2013-06-07 21:29:45 +00:00
Craig Mautner
8c4a8243c7 Merge "Finish InputEvents." 2013-06-07 21:25:42 +00:00
Romain Guy
81056427e8 Merge "Remove unnecessary Rect, better reuse of NinePatch objects" 2013-06-07 20:14:58 +00:00
Romain Guy
f3187b7df1 Remove unnecessary Rect, better reuse of NinePatch objects
Cloning drawables (which happens a lot) was creating copies of NinePatch
objects, which would cause the hardware renderer to generate more meshes
than necessary. Also avoid keeping a String we don't need (it was interned
but still.) Last but not least, remove 1 RectF per NinePatch in the system.

Change-Id: If4dbfa0c30892c9b00d68875e334fd5c2bde8b94
2013-06-07 12:17:11 -07:00
Adam Powell
a4d04291d4 am 87c79d64: am d3cb6bcf: am 8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
* commit '87c79d64abeb65468a49729f23c97c7e3b9d7e49':
  Fix incorrect fragment animation used for hiding fragments
2013-06-07 11:56:56 -07:00
Adam Powell
87c79d64ab am d3cb6bcf: am 8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
* commit 'd3cb6bcf0f63317d1078a2f897d4824ba91402a6':
  Fix incorrect fragment animation used for hiding fragments
2013-06-07 11:52:36 -07:00
Adam Powell
d3cb6bcf0f am 8152c794: Merge "Fix incorrect fragment animation used for hiding fragments"
* commit '8152c7940a10f11a9edb16ae1daeca8a6fe2e6bb':
  Fix incorrect fragment animation used for hiding fragments
2013-06-07 11:49:32 -07:00
Adam Powell
8152c7940a Merge "Fix incorrect fragment animation used for hiding fragments" 2013-06-07 18:46:18 +00:00
Romain Guy
3f5e9e8019 Merge "Avoid Binder call when getting the Window service" 2013-06-07 18:07:18 +00:00
Craig Mautner
d982e6d965 Finish InputEvents.
StackTapDetector was leaking InputEvents. Fixes bug 9180347.

Change-Id: Ib526768024b54021ca02e6183bae847e217bb68d
2013-06-07 11:05:08 -07:00
Romain Guy
e50848bfba Avoid Binder call when getting the Window service
Change-Id: Ie4f01838402bec4b387e40ce02a1af7f12941538
2013-06-07 10:57:25 -07:00
Adam Powell
2756293910 Fix incorrect fragment animation used for hiding fragments
Mirror of support lib patch
https://android-review.googlesource.com/#/c/60032/ into
frameworks/base.

Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd
2013-06-07 10:19:22 -07:00
Scott Main
20b53f89fa am ad47f8c2: am 00d17f7a: add attributes to accessibility service info
* commit 'ad47f8c2dc31247ce9f504eccf21d50d115129d7':
  add attributes to accessibility service info
2013-06-07 09:46:50 -07:00
Scott Main
ad47f8c2dc am 00d17f7a: add attributes to accessibility service info
* commit '00d17f7aab54ef055d35da603dab5a7bae751876':
  add attributes to accessibility service info
2013-06-07 09:44:18 -07:00
John Spurlock
d3b3c063e8 Merge "Put overlay system bar testing behind a setting." 2013-06-07 16:23:27 +00:00
Baligh Uddin
b0a32e8139 Merge "Import translations. DO NOT MERGE" 2013-06-07 15:53:31 +00:00
Baligh Uddin
1e87dd58bd Merge "Import translations. DO NOT MERGE" 2013-06-07 15:49:56 +00:00
John Spurlock
245fd017b3 Put overlay system bar testing behind a setting.
And disable the system gesture by default.  Also remove observer
for obsolete "fancy_rotation_anim" setting.

Change-Id: I08012c164e10bfa5f10a1df8a3db4a3f0203f236
2013-06-07 11:02:53 -04:00
Chet Haase
5133dcb838 Merge "Additional functionality and performance for ArrayMap" 2013-06-07 14:05:46 +00:00
Satoshi Kataoka
65ea41541b Merge "Fix an issue where "SuggestionSpan"s are not removed properly" 2013-06-07 07:59:44 +00:00
Chong Zhang
799d4af8cf Merge "wifi-display: set display to unavailable if p2p device is unavailable" 2013-06-07 03:28:11 +00:00
Scott Main
00d17f7aab add attributes to accessibility service info
Change-Id: I3651544164f718003b8eb1235a7d723f1bcee5be
2013-06-06 18:37:59 -07:00
Scott Main
8c8391ad6a am cdad1772: am b8e4d95c: am a7ba45ec: am 7381c7e5: am b2b216e7: add links to a couple intellij docs for Eclipse users
* commit 'cdad1772e18e6f6f563b369c41d453e181a5169c':
  add links to a couple intellij docs for Eclipse users
2013-06-06 17:57:59 -07:00
Scott Main
cdad1772e1 am b8e4d95c: am a7ba45ec: am 7381c7e5: am b2b216e7: add links to a couple intellij docs for Eclipse users
* commit 'b8e4d95c22e0f44aee5cb3001262b5154bf90cb7':
  add links to a couple intellij docs for Eclipse users
2013-06-06 17:55:15 -07:00
Scott Main
b8e4d95c22 am a7ba45ec: am 7381c7e5: am b2b216e7: add links to a couple intellij docs for Eclipse users
* commit 'a7ba45ec7cbaaa1dbfcd6601bb42abd5ea39547f':
  add links to a couple intellij docs for Eclipse users
2013-06-06 17:51:20 -07:00
Romain Guy
241ef0cc42 Merge "Assume a texture is unbound after deleting it Bug #9316260" 2013-06-07 00:07:05 +00:00
Svetoslav
494cb689d0 Merge "Optimizing AccessibilityNodeInfo caching." 2013-06-07 00:04:57 +00:00
Chet Haase
f4130cf35f Additional functionality and performance for ArrayMap
Added equals() and hashCode() to ArrayMap to allow equals() tests
of maps with the same key/value pairs to return true.

Changed putAll() to handle the case of an empty map faster, just copying
the arrays instead of adding elements one by one.

Added to ArrayMapTests to test new equals() and copy constructor
functionality.

Issue #9299310 Optimize ArrayMap copy constructor

Change-Id: I1186a0eddd1fd53a0f380c2f3972fc1942cdf879
2013-06-06 16:43:41 -07:00
Romain Guy
be1b127c7b Assume a texture is unbound after deleting it
Bug #9316260

The GL specification indicates that deleting a bound texture has
the side effect of binding the default texture (name=0). This change
replaces all calls to glDeleteTextures() by Caches::deleteTexture()
to properly keep track of texture bindings.

Change-Id: Ifbc60ef433e0f9776a668dd5bd5f0adbc65a77a0
2013-06-06 16:26:51 -07:00
Chong Zhang
21f603996e wifi-display: set display to unavailable if p2p device is unavailable
Bug 9229799

Change-Id: I680015943f40cded45645dfa0eae42bbce5ce9a3
2013-06-06 15:49:16 -07:00
Scott Main
a7ba45ec7c am 7381c7e5: am b2b216e7: add links to a couple intellij docs for Eclipse users
* commit '7381c7e54b8dfb91b6fac5c7e00a62738c849135':
  add links to a couple intellij docs for Eclipse users
2013-06-06 15:40:05 -07:00
Scott Main
7381c7e54b am b2b216e7: add links to a couple intellij docs for Eclipse users
* commit 'b2b216e79880884f7ebbea6ee997fc88edc229fc':
  add links to a couple intellij docs for Eclipse users
2013-06-06 15:38:16 -07:00