Commit Graph

19177 Commits

Author SHA1 Message Date
Dianne Hackborn
0ba3f30655 am a982ad19: Merge "Fix issue #5173952: Opening a Notification From Lock Screen..."
* commit 'a982ad19d2aee54f714fa3ad9ee4ddbac08dc0fe':
  Fix issue #5173952: Opening a Notification From Lock Screen...
2011-09-23 14:56:48 -07:00
Dianne Hackborn
a982ad19d2 Merge "Fix issue #5173952: Opening a Notification From Lock Screen..." 2011-09-23 14:54:26 -07:00
John Reck
76d4fda68c am 6c984bcb: Merge "Add detail to restorePicture deprecation"
* commit '6c984bcb179c74c2fa3c814596792629d1005355':
  Add detail to restorePicture deprecation
2011-09-23 14:50:39 -07:00
John Reck
6c984bcb17 Merge "Add detail to restorePicture deprecation" 2011-09-23 14:48:52 -07:00
Svetoslav Ganov
88226bf0da am 83a559e7: Merge "Scroll accessibility events should not populate text."
* commit '83a559e78f57703645066c822a1ec7257c06ba56':
  Scroll accessibility events should not populate text.
2011-09-23 14:07:22 -07:00
Amith Yamasani
7583ac63d7 am e7d70563: Merge "Launch nested preferences with the same theme as parent activity."
* commit 'e7d70563839bbf0ce8d548fe7223229ec2ecd635':
  Launch nested preferences with the same theme as parent activity.
2011-09-23 14:07:19 -07:00
Scott Main
2d31058424 am c86bc42c: Merge "docs: a few additions and revisions to action bar docs"
* commit 'c86bc42cb1b910c1150c8f5aa74c1c160c1359e3':
  docs: a few additions and revisions to action bar docs
2011-09-23 14:07:14 -07:00
Dianne Hackborn
90c52de286 Fix issue #5173952: Opening a Notification From Lock Screen...
...Should Skip Unsecure Lockscreen (ICS)

Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).

Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
2011-09-23 13:39:33 -07:00
Svetoslav Ganov
83a559e78f Merge "Scroll accessibility events should not populate text." 2011-09-23 13:26:18 -07:00
Amith Yamasani
e7d7056383 Merge "Launch nested preferences with the same theme as parent activity." 2011-09-23 13:24:38 -07:00
Scott Main
c86bc42cb1 Merge "docs: a few additions and revisions to action bar docs" 2011-09-23 13:13:13 -07:00
Scott Main
e797ed6a74 docs: a few additions and revisions to action bar docs
Change-Id: I12c24e5d4ed49d8f9822050d330f617bd614b7b9
2011-09-23 12:56:20 -07:00
Adam Powell
0cdb24da5b am 90d33ccd: Merge "Remove unnecessary parameter"
* commit '90d33ccd16cf909ac4920a593772204d7bcf45db':
  Remove unnecessary parameter
2011-09-23 12:47:03 -07:00
Adam Powell
90d33ccd16 Merge "Remove unnecessary parameter" 2011-09-23 12:45:13 -07:00
Adam Powell
4f4b7fbf3c am 5c267ece: Merge "Fix leaky view tags"
* commit '5c267ecec6529a384e76a8b4a261b73aadaf1130':
  Fix leaky view tags
2011-09-23 11:36:31 -07:00
Adam Powell
2b2f6d6c54 Remove unnecessary parameter
Change-Id: I32810a31140263a996d4f600fa53db5f29e60f42
2011-09-23 11:15:39 -07:00
Adam Powell
5c267ecec6 Merge "Fix leaky view tags" 2011-09-23 11:05:25 -07:00
Amith Yamasani
72e6bece43 Launch nested preferences with the same theme as parent activity.
Bug: 5351628
Change-Id: Id67b81558bc6e010d6f024cdb8117424aa6b62f0
2011-09-23 10:43:40 -07:00
Wei Huang
68d7e0d2ab am e448f557: am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit 'e448f557f620ae30dcead7a4423059dfb7d70add':
  Update camera javadoc about AE and AWB lock.
2011-09-23 10:07:33 -07:00
Wei Huang
e448f557f6 am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
  Update camera javadoc about AE and AWB lock.
2011-09-23 10:05:22 -07:00
Wei Huang
3d9a9e55df Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 2011-09-23 10:04:02 -07:00
John Reck
2df8f425f6 Add detail to restorePicture deprecation
Bug: 5361506

Change-Id: I4bf6583170df50b218051f4700700ff1b8874d17
2011-09-23 09:27:01 -07:00
Mike Lockwood
78b19b4307 Merge "Add SerialPort.sendBreak()" into ics-aah 2011-09-23 09:02:20 -07:00
Mike Lockwood
6010dafe06 Add SerialPort.sendBreak()
Change-Id: If25ba7724cf69489f2b04fc995baa9c164b5ea58
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-23 11:43:42 -04:00
Wei Huang
0205a57284 am 4cd34752: am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
* commit '4cd34752cb229f3e1716e1e92f54f58dd847745c':
  Clear callbacks in camera stopPreview.
2011-09-23 08:37:20 -07:00
Wei Huang
4cd34752cb am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
  Clear callbacks in camera stopPreview.
2011-09-23 08:33:46 -07:00
Chih-yu Huang
664d72e663 Clear callbacks in camera stopPreview.
Clear those callbacks to remove the references
so the memory can be recycled.

bug:5358774
Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
2011-09-23 20:28:28 +08:00
Svetoslav Ganov
b84b94e1a0 Scroll accessibility events should not populate text.
Scroll events are used to report position change and should not
contain the text content of the view that fires them because it
is usiually a containter for many other views and the text will
be long and not informative for accessibility purposes. Also
such evens are fired relatively frequently. If a client wants
to fetch some textual content for a scroll event he can use
the interrogation APIs.

bug:5352059

Change-Id: I43e02aca895c8ab16ba82ebe1cee3aea8ce7711a
2011-09-22 19:55:47 -07:00
Adam Powell
7db82acd81 Fix leaky view tags
The implementation of the method View#setTag(int, Object) stored tag
objects as entries in a static WeakHashMap associated with the View as
a key. This was problematic for any tag object that stored a hard
reference back to the View the tag was placed on, as it would cause
the WeakReference key to never be collected and the entry to persist
forever.

This was particularly nasty if an app used a keyed tag to store a
ViewHolder object referencing child views for use in the Adapter
implementaion for an AdapterView, since child views will always have
hard references leading back to the parent.

Change-Id: Ia17840a301ba0e0c928861405388fb2f625dac2c
2011-09-22 19:55:41 -07:00
Svetoslav Ganov
c82cd08aa5 am 1ac6b1e2: Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown."
* commit '1ac6b1e221a76d7f09f47599449227e934d61d83':
  ActivityChooserView not showing "Show all" properly if the default target button not shown.
2011-09-22 19:10:51 -07:00
Svetoslav Ganov
1ac6b1e221 Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown." 2011-09-22 19:08:26 -07:00
Svetoslav Ganov
f632eaa9d6 ActivityChooserView not showing "Show all" properly if the default target button not shown.
If the default target button is hidden all activities are shown in the list from
which to choose. In this case due to off by one error the list was not showing the
option to expand it if the activities are one more than the initially shown.

bug:5358475

Change-Id: I8c3db37dab008637d78330f8de830cec92720264
2011-09-22 16:09:46 -07:00
Daniel Sandler
44f5cc031d am 7933b705: am cc22b992: Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom
* commit '7933b7056f9886789e46e4151ed6c03f9f3d9398':
  Revert "Allow views to setSystemUiVisibility() with the same value and have it work."
2011-09-22 10:33:15 -07:00
Daniel Sandler
7933b7056f am cc22b992: Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom
* commit 'cc22b99249ac80891af99be941862edc9569fc4b':
  Revert "Allow views to setSystemUiVisibility() with the same value and have it work."
2011-09-22 10:31:47 -07:00
Daniel Sandler
cc22b99249 Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom 2011-09-22 10:29:31 -07:00
Fabrice Di Meglio
f9b49ee1c2 am bedc1eb1: Merge "Bug 5279842: mis alignment after scroll"
* commit 'bedc1eb19d6c12facf65249ceb46cbabb6e0b05b':
  Bug 5279842: mis alignment after scroll
2011-09-22 10:27:19 -07:00
Fabrice Di Meglio
bedc1eb19d Merge "Bug 5279842: mis alignment after scroll" 2011-09-22 10:25:57 -07:00
Chet Haase
9d5670a032 am 5ce34861: Merge "Fix 5335993, calculate correct size of lockscreen buttons"
* commit '5ce348615b6572451c81e9962aadeb061fca19cc':
  Fix 5335993, calculate correct size of lockscreen buttons
2011-09-22 07:56:58 -07:00
Chet Haase
5ce348615b Merge "Fix 5335993, calculate correct size of lockscreen buttons" 2011-09-22 07:55:23 -07:00
Ken Wakasa
ed594d1e22 am 9f48d634: Fix comment
* commit '9f48d6348d0a1c24e51d6526fb6b282997b22ae5':
  Fix comment
2011-09-22 03:52:53 -07:00
Ken Wakasa
9f48d6348d Fix comment
Change-Id: Ic0fd15d0b1b4d2c24eb177a6b22e0cc08ec1de99
2011-09-22 19:24:48 +09:00
Wu-cheng Li
b4f95be03e Update camera javadoc about AE and AWB lock.
- Autofocus does not lock AE and AWB.
- stopPreview and takePicture do not clear AE and AWB locks.

bug:5356404

Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
2011-09-22 18:19:02 +08:00
Jeff Brown
088663e846 am a829e166: Merge "Handle orientation changes more systematically. Bug: 4981385"
* commit 'a829e16681903e6a41901145195f88bf9d952f88':
  Handle orientation changes more systematically. Bug: 4981385
2011-09-21 21:11:37 -07:00
Jeff Brown
a829e16681 Merge "Handle orientation changes more systematically. Bug: 4981385" 2011-09-21 21:09:10 -07:00
Jeff Brown
01a98ddbdf Handle orientation changes more systematically.
Bug: 4981385

Simplify the orientation changing code path in the
WindowManager.  Instead of the policy calling setRotation()
when the sensor determined orientation changes, it calls
updateRotation(), which figures everything out.  For the most
part, the rotation actually passed to setRotation() was
more or less ignored and just added confusion, particularly
when handling deferred orientation changes.

Ensure that 180 degree rotations are disallowed even when
the application specifies SCREEN_ORIENTATION_SENSOR_*.
These rotations are only enabled when docked upside-down for
some reason or when the application specifies
SCREEN_ORIENTATION_FULL_SENSOR.

Ensure that special modes like HDMI connected, lid switch,
dock and rotation lock all cause the sensor to be ignored
even when the application asks for sensor-based orientation
changes.  The sensor is not relevant in these modes because
some external factor (or the user) is determining the
preferred rotation.

Currently, applications can still override the preferred
rotation even when there are special modes in play that
might say otherwise.  We could tweak this so that some
special modes trump application choices completely
(resulting in a letter-boxed application, perhaps).
I tested this sort of tweak (not included in the patch)
and it seems to work fine, including transitions between
applications with varying orientation.

Delete dead code related to animFlags.

Handle pausing/resuming orientation changes more precisely.
Ensure that a deferred orientation change is performed when
a drag completes, even if endDragLw() is not called because the
drag was aborted before the drop happened.  We pause
the orientation change in register() and resume in unregister()
because those methods appear to always be called as needed.

Change-Id: If0a31de3d057251e581fdee64819f2b19e676e9a
2011-09-21 19:26:15 -07:00
Svetoslav Ganov
99f5486054 am df8e00ff: am 624181af: Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom
* commit 'df8e00ff335be747ec3b99038734d2c6bec6499f':
  Settings are restored in alphabetical order rather in order of dependency.
2011-09-21 19:13:14 -07:00
Jaikumar Ganesh
a42a8038dd am a0c7ec2b: am 90fb9aa9: Merge "Make Bluetooth Health constant public." into ics-factoryrom
* commit 'a0c7ec2b5a6940c504ea5af0db46ebc0ec091155':
  Make Bluetooth Health constant public.
2011-09-21 19:11:02 -07:00
Kenny Root
d5ebd5694f am 0d3647dc: am 9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
* commit '0d3647dc00849872ec5e18cce8ffe0e6ae02dd47':
  Unhide new PackageManager APIs for API 14
2011-09-21 19:10:58 -07:00
Svetoslav Ganov
df8e00ff33 am 624181af: Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom
* commit '624181af38f7f9e4fe4a18ca3e15204f30609312':
  Settings are restored in alphabetical order rather in order of dependency.
2011-09-21 19:08:28 -07:00
Gilles Debunne
b2beb92073 Bug 5279842: mis alignment after scroll
Refactored.

Original problem was the ALIGN_RIGHT case that was not handled.

Change-Id: Id01b75ac404b7ee92143e8cf6e3a3a838b794da8
2011-09-21 19:08:02 -07:00