Commit Graph

25065 Commits

Author SHA1 Message Date
Jeff Brown
419822e22f am 2dc6af20: Merge "Fixup a comment." into jb-mr1-dev
* commit '2dc6af2082b93849b2e5519a8ae7504757286aa9':
  Fixup a comment.
2012-09-14 00:04:15 -07:00
Jeff Brown
2dc6af2082 Merge "Fixup a comment." into jb-mr1-dev 2012-09-14 00:01:06 -07:00
Jeff Brown
565f0425ba Fixup a comment.
Change-Id: I7b73f7e0f0aa903e5cd02d1cdb678e65a6d40e0c
2012-09-14 00:00:17 -07:00
Romain Guy
c4ea87e50d am 51d71003: Merge "Prevent crash when invalidating all Views Bug #7165793" into jb-mr1-dev
* commit '51d71003e4211b273b8e00adf85389e91ea4bdff':
  Prevent crash when invalidating all Views Bug #7165793
2012-09-13 22:55:24 -07:00
Romain Guy
f84208faf8 Prevent crash when invalidating all Views
Bug #7165793

A ViewRootImpl's root view can be null. Check for this condition to
prevent an NPE invalidateWorld(). Other messages perform a similar
check to properly handle the case where mView == null.

Change-Id: I5bcfc41c48a469d38b21be74df2f6c715b0f9352
2012-09-13 22:50:18 -07:00
Svetoslav Ganov
0ae6039adc am 33aef98f: Allowing association between a view and its label for accessibility.
* commit '33aef98fd28dcac0a2ad37e7329afd3e666f5e0a':
  Allowing association between a view and its label for accessibility.
2012-09-13 18:47:06 -07:00
Alan Viverette
0f2d09fc59 am 0f755134: Revert "Add accessibility scroll actions to TabWidget"
* commit '0f7551341f7504632e4943c66d6a4fd504bf5a0e':
  Revert "Add accessibility scroll actions to TabWidget"
2012-09-13 18:41:53 -07:00
Svetoslav Ganov
33aef98fd2 Allowing association between a view and its label for accessibility.
1. For accessibility purposes it is important to be able to associate
   a view with content with a view that labels it. For example, if
   an accessibility service knows that a TextView is associated with
   an EditText, it can provide much richer feedback.

   This change adds APIs for setting a view to be the label for another
   one and setting the label for a view, i.e. the reverse association.

bug:5016937

Change-Id: I7b837265c5ed9302e3ce352396dc6e88413038b5
2012-09-13 18:41:40 -07:00
Alan Viverette
0f7551341f Revert "Add accessibility scroll actions to TabWidget"
This reverts commit 6053088884

Change-Id: Ia648d7e3e092c396a038740d708de37fe4169d80
2012-09-13 18:36:06 -07:00
Adam Powell
c59d86ef15 am 83835b17: Merge "Break flings with opposing velocities" into jb-mr1-dev
* commit '83835b17f259fc38478c72b7f59b14796bbc622a':
  Break flings with opposing velocities
2012-09-13 17:26:39 -07:00
Adam Powell
83835b17f2 Merge "Break flings with opposing velocities" into jb-mr1-dev 2012-09-13 16:45:24 -07:00
Adam Powell
cd66359ab9 Break flings with opposing velocities
Change-Id: Iafab692997ad7c2cbbf02d786a716e6edb6475a7
2012-09-13 16:28:29 -07:00
Jeff Brown
e63a1a05d7 am cdfc56a3: Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev
* commit 'cdfc56a3872f6bae7c43aedd5c718c5fa3fbdf9d':
  Add preliminary API for reporting display capabilities.
2012-09-13 15:36:19 -07:00
Jeff Brown
cdfc56a387 Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev 2012-09-13 15:34:51 -07:00
Svetoslav Ganov
e6a0b56032 am 83cdb021: Merge "Add accessibility scroll actions to TabWidget" into jb-mr1-dev
* commit '83cdb021eb9a8cfe26cd565febadb1a70380f3a9':
  Add accessibility scroll actions to TabWidget
2012-09-13 15:07:10 -07:00
Svetoslav Ganov
83cdb021eb Merge "Add accessibility scroll actions to TabWidget" into jb-mr1-dev 2012-09-13 15:04:03 -07:00
Kenny Root
5d6d5f3d7a am 24271a8c: Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev
* commit '24271a8c4c55a60047fd3d35c8a7af98b0f4e666':
  Use shared app gid for forward-locked processes
2012-09-13 14:46:38 -07:00
Kenny Root
24271a8c4c Merge "Use shared app gid for forward-locked processes" into jb-mr1-dev 2012-09-13 14:43:20 -07:00
alanv
6053088884 Add accessibility scroll actions to TabWidget
Bug: 6537369
Change-Id: I8a5bf1d6f85f0ceef316aa4a5938d32a545587db
2012-09-13 14:02:29 -07:00
Craig Mautner
965c9f9709 am dcd8c81b: Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev
* commit 'dcd8c81bf4beb719888b6be1b9418303c9075938':
  Propagate systemUiVisibility changes to window manager
2012-09-13 13:58:08 -07:00
Craig Mautner
dcd8c81bf4 Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-dev 2012-09-13 13:55:51 -07:00
Craig Mautner
7eac0f557c Propagate systemUiVisibility changes to window manager
The mAttachInfo.mSystemUiVisibility value was changing in
View.dispatchAttachedToWindow but
mAttachInfo.mRecomputeGlobalAttributes was not being set.
Consequently ViewRootImpl.collectViewAttributes was returning
without updating the subtreeSystemUiVisibility. This is fixed
by calling needGlobalAttributesUpdate in dispatchAttachedToWindow.

WIthin ViewRootImpl.collectViewAttributes the assignment to
subtreeSystemUiVisibility was only being made if
mAttachInfo.mSystemUiVisibility was changed within
collectViewAttributes. But mAttachInfo.mSystemUiVisibility
was changing outside of collectViewAttributes in
dispatchAttachedToWindow. Consequently subtreeSystemUiVisibility
was never updated. By looking for a mismatch between
subtreeSystemUiVisibility and mSystemUiVisibility
subtreeSystemUiVisibility gets assigned whenever it is out of
sync.

Fixes bug 7091817.

Change-Id: I1e97a7dec14dc9594876175ae26370fb9030a8a6
2012-09-13 13:14:14 -07:00
Jeff Brown
c5df37c285 Add preliminary API for reporting display capabilities.
Change-Id: Ie18dce5b5d130f9a7cdfca08cddbf9b099312277
2012-09-13 11:45:07 -07:00
Eino-Ville Talvala
caea2213d5 am f353f948: Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev
* commit 'f353f948a5867fb43c9ee1dbec1ebc93f91655ec':
  NEW_API: Unhide android.hardware.Camera#enableShutterSound
2012-09-13 11:18:09 -07:00
Eino-Ville Talvala
f353f948a5 Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev 2012-09-13 11:15:15 -07:00
Geremy Condra
f60921d921 Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev
* changes:
  DO NOT MERGE Push event logging down into libcore.EventLogger
  DO NOT MERGE Added event logging for config installation failures.
  DO NOT MERGE Create intermediate directories when installing config data.
  DO NOT MERGE Add components for the Android Config Updater to system server.
2012-09-13 10:42:22 -07:00
Jeff Sharkey
e2332dfc3b am cae22d83: Merge "Give DefaultContainerService all external storage." into jb-mr1-dev
* commit 'cae22d83a7225c38ef6f51723e13d5741d1cd69b':
  Give DefaultContainerService all external storage.
2012-09-13 01:34:30 -07:00
Jeff Sharkey
cae22d83a7 Merge "Give DefaultContainerService all external storage." into jb-mr1-dev 2012-09-13 01:31:04 -07:00
Jeff Sharkey
dfa45309e0 Give DefaultContainerService all external storage.
Now we can bind to just one instance of DCS, instead of requiring
one-per-user. This also means we can operate on otherwise-stopped
users.

Bug: 7003520
Change-Id: I4881e064ae8942907f6a02c6b868926223455cdc
2012-09-13 01:04:15 -07:00
Dianne Hackborn
6ba04590de am 3e451fa1: Merge "New permissions UI, again." into jb-mr1-dev
* commit '3e451fa128e5b7beb22b413eb5600d6c980e5a29':
  New permissions UI, again.
2012-09-12 21:39:06 -07:00
Dianne Hackborn
7454d3b73c New permissions UI, again.
Change-Id: I0bbecd88ff1f212b30d1ef32d5bcaa49cdf1e9ce
2012-09-12 18:57:07 -07:00
Geremy Condra
69689a7356 DO NOT MERGE Push event logging down into libcore.EventLogger
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.

Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8

Conflicts:

	core/java/android/app/ActivityThread.java
2012-09-12 17:54:10 -07:00
Christopher Tate
32ad490c12 am 79cf1a22: Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev
* commit '79cf1a22914aa8ca245a6ca598348bbbb19ff9a6':
  Moved a few telephony settings from Secure to Global
2012-09-12 17:53:48 -07:00
Christopher Tate
79cf1a2291 Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev 2012-09-12 17:51:36 -07:00
Fabrice Di Meglio
9b9a28339f am bbbb154c: Merge "Fix Javadoc spelling" into jb-mr1-dev
* commit 'bbbb154c8986f5c731f159ec6d043945b896183b':
  Fix Javadoc spelling
2012-09-12 17:43:56 -07:00
Christopher Tate
c868b645b4 Moved a few telephony settings from Secure to Global
Also tidy up the bookkeeping for a few settings that were earlier
moved to Global without the redirect tables being fixed up.

Change-Id: I69275db3b2636cd6ba9c8c51b88e97d8ba4b7b7d
2012-09-12 17:42:43 -07:00
Fabrice Di Meglio
bbbb154c89 Merge "Fix Javadoc spelling" into jb-mr1-dev 2012-09-12 17:41:27 -07:00
Chet Haase
4277f86c63 am 0c348b6d: Merge "end() a reverse()\'d animation correctly" into jb-mr1-dev
* commit '0c348b6dd734e1d10d3b51ea95f60900789f0310':
  end() a reverse()'d animation correctly
2012-09-12 17:32:53 -07:00
Chet Haase
0c348b6dd7 Merge "end() a reverse()'d animation correctly" into jb-mr1-dev 2012-09-12 17:30:16 -07:00
Dianne Hackborn
a0c94d333c am 3c78702d: Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev
* commit '3c78702db58af95b71b87c356f8fb0f95f3b70a7':
  Maybe fix issue #7146119: exception in FragmentManager
2012-09-12 17:10:39 -07:00
Dianne Hackborn
3c78702db5 Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev 2012-09-12 17:04:42 -07:00
Chet Haase
4dd1768643 end() a reverse()'d animation correctly
Previously, an animator that had been reverse()'d (and was thus
playing backwards) would not end() at the right value. That is, a call
to end() would cause the animation to snap to its original end value, not
the reverse-playing end value (i.e., its start value). Logic to handle
calculating the proper end value was not taking the reversing behavior
into account.

Issue #6583656 When you call end() after calling reverse() on an animation that has not started leads to forward animation finishing.

Change-Id: Ifca60a32d4973c21b85aed9c459f802526c0207e
2012-09-12 16:33:26 -07:00
Fabrice Di Meglio
61a21770b7 Fix Javadoc spelling
Change-Id: I93685d3d092ce5e16bfa0e65e11d85ae030f3f29
2012-09-12 16:33:13 -07:00
Makoto Onuki
c3331e4168 am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev
* commit 'b11b9fc9972ba0ae7f3d13984c5c61a8d89ca142':
  A new broadcast action which is sent when profile changes
2012-09-12 16:14:01 -07:00
Makoto Onuki
b11b9fc997 Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 2012-09-12 16:11:13 -07:00
Selim Gurun
0da798d458 am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev
* commit 'f4fd2eb5ee425a29aa2bed4c92ea21ac5fd7fd69':
  Minor update to addjavascriptinterface documentation
2012-09-12 13:42:59 -07:00
Selim Gurun
f4fd2eb5ee Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 2012-09-12 13:41:09 -07:00
Selim Gurun
b4c02e6ffd Minor update to addjavascriptinterface documentation
Change-Id: I67525673e3d061e00fbe8989c08050ad84e78920
2012-09-12 13:36:21 -07:00
Fabrice Di Meglio
466b7a7c87 am 2cd35662: Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev
* commit '2cd35662caa824846555a3be595b7fa69337fa31':
  Fix SeekBar when in RTL layout direction
2012-09-12 13:29:58 -07:00
Fabrice Di Meglio
3736c23a67 am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev
* commit '8872465709d336083a908cb79d08661c6658265b':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
2012-09-12 13:29:53 -07:00