84065 Commits

Author SHA1 Message Date
Christopher Tate
970683c5d4 Merge "Further fixup of migration to global settings" into jb-mr1-dev 2012-09-07 12:56:42 -07:00
Elliott Hughes
5ef49427b6 Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
Two reported by users, the other spotted by inspection.

Bug: http://code.google.com/p/android/issues/detail?id=16002
Bug: http://code.google.com/p/android/issues/detail?id=22225
Change-Id: I86fe022fda4af68e5a6fb9dc5dd2abdb75e9d966

This was committed to master, cherry-picking to jb-mr1-dev
2012-09-07 12:42:18 -07:00
Christopher Tate
9219874be9 Further fixup of migration to global settings
The Settings.System.STAY_ON_WHILE_PLUGGED element should have been
migrated to the global table, but wasn't.  This CL does a couple of
things around dealing with this:

(1) Tidies up the migration tables outright, so that they correctly
    reflect the intended final state

(2) Introduces the option of doing a key migration only if the element
    has not yet been moved to the new table, to allow for safe retry-
    -with-ignore.  This will make it easy to make any future alterations
    to the global vs per-user association of individual elements

(3) Migrates the STAY_ON_WHILE_PLUGGED element if it hasn't been already.

Bug 7126575

Change-Id: Ic5fa9ba45f11b09270bd5bc94c26fbbd84abc749
2012-09-07 12:00:13 -07:00
Teng-Hui Zhu
4db5d23dea Merge "Back key to dismiss full screen video" into jb-mr1-dev 2012-09-07 11:49:54 -07:00
Fabrice Di Meglio
d672d29dd0 Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev 2012-09-07 11:39:27 -07:00
Fabrice Di Meglio
bae1d47896 Merge "Fix the build" into jb-mr1-dev 2012-09-07 11:37:35 -07:00
Fabrice Di Meglio
c5daf84f66 Fix the build
- use fully qualified name for Javadoc

Change-Id: Ic75ce7e19d407dc40c96b585f9fa1827fb614ba1
2012-09-07 11:36:21 -07:00
Katie McCormick
56b6293976 am 21d8331d: am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev
* commit '21d8331d610bb641e63e9f7ff00bb5db8f97f283':
  Doc update: Appwidgets JB additions.
2012-09-07 11:10:53 -07:00
Katie McCormick
21d8331d61 am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev
* commit 'ae050d56247257f652fecb71e3f2ed474238e23f':
  Doc update: Appwidgets JB additions.
2012-09-07 11:08:46 -07:00
Katie McCormick
ae050d5624 Merge "Doc update: Appwidgets JB additions." into jb-dev 2012-09-07 11:06:00 -07:00
Dirk Dougherty
7629a917d7 am 0152a51c: am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev
* commit '0152a51c46743a6759711b872c80b406ae4c8a44':
  Doc change: fix typo in JB highlights.
2012-09-07 10:55:14 -07:00
Dirk Dougherty
0152a51c46 am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev
* commit '882b267d189bdbab02e44f7fe87c5c55aa04c493':
  Doc change: fix typo in JB highlights.
2012-09-07 10:52:37 -07:00
Dirk Dougherty
882b267d18 Merge "Doc change: fix typo in JB highlights." into jb-dev 2012-09-07 10:49:42 -07:00
Dirk Dougherty
6ca8f880bd Doc change: fix typo in JB highlights.
Change-Id: I807a8ecee5d352c8494154629b92474ba4b0e892
2012-09-07 10:48:05 -07:00
Eric Laurent
53082eced9 AudioSystem: new audio device enums
Update audio device enums to match new definitions in
native framework.

Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
2012-09-07 10:41:03 -07:00
Svetoslav Ganov
390a06b882 Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev 2012-09-07 10:32:55 -07:00
Romain Guy
6543c292b2 Merge "The drawables cache strikes again Bug #7117785" into jb-mr1-dev 2012-09-07 10:32:55 -07:00
alanv
30ee76cf05 Restore accessibility focus after ListView layout.
Bug: 6439454
Change-Id: Ia61f5153b32c6ce5d18301f74e7e79c86349b987
2012-09-07 10:31:16 -07:00
Fabrice Di Meglio
f6aa537c2d Merge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction" into jb-mr1-dev 2012-09-07 10:19:23 -07:00
Fabrice Di Meglio
01fcb72894 Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev 2012-09-07 10:17:55 -07:00
Mike Dodd
37ee53420c Merge "Add context support to backdropper filter." into jb-mr1-dev 2012-09-07 08:43:36 -07:00
Marco Nelissen
41ed910439 Merge "Audio Effects test app" into jb-mr1-dev 2012-09-07 07:41:17 -07:00
Wu-cheng Li
e590dc6f7d Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
bug:7053266

Change-Id: I4e00199598f57f11250abeab4ce17ced18f41f14
2012-09-07 19:05:41 +08:00
Wu-cheng Li
2ab0113b1e Pass EXCLUDE_FROM_RECENTS when starting secure camera.
Camera started from the secure lock screen does not
show all the pictures in the camera roll. If users
launch camera from recent apps, they may enter secure
camera mode accidentally. Pass EXCLUDE_FROM_RECENTS
flag to prevent this.

bug:7053266
Change-Id: I0ad526d919dac02f358b25493777d7d73da6987f
2012-09-07 18:03:35 +08:00
Matthew Xie
240a90d278 Merge "Fault tolerance in Bluedroid" into jb-mr1-dev 2012-09-07 00:07:23 -07:00
Syed Ibrahim M
1223e5a311 Fault tolerance in Bluedroid
When bluetooth process gets crashed/killed/stopped by Android
system, BluetoothManagerService will re-start AdapterService
to recover from the crash appropriately.

Change-Id: Iacb1a06a8245089517bbbd57de1378ca8ce4b41e
2012-09-06 23:55:41 -07:00
Jason Sams
c1ccbf5231 Add greyscale intrinsic test.
Change-Id: I24c9b8769ab7fe2fed9ef17f7ff1063c60977c41
2012-09-06 23:54:05 -07:00
Jason Sams
8fd5853c1c Document ColorMatrix intrinsic and add helpers
Increase size of test image.
Add helpers for greyscale and yuv<>rgb conversions

Change-Id: I6cdd06ae23623b47f5034585ed5d385ff11348ac
2012-09-06 23:29:36 -07:00
Jeff Sharkey
9545dc020e Include primary flag in StorageVolume.
Bug: 7003520
Change-Id: Iaae2ae22253820c954c51e0199c31087bc825f3f
2012-09-06 23:15:20 -07:00
Jeff Sharkey
162fabbcf8 Let Pair represent null values.
Bug: 7121262
Change-Id: I067ea0a4af40a0e8935a9408404df7a2e851e22c
2012-09-06 23:05:11 -07:00
Christopher Tate
1a9c0dfdbb Mark all settings upgrade transactions as successful along the way
If you don't, then the upgrade gets rolled back by the open helper,
and Bad Stuff Happens.

Change-Id: I191263e5cceb21b96ef413d28e7ee00a924acfc2
2012-09-06 22:52:23 -07:00
Scott Main
bd4a708735 docs: update for multi apk doc for ABI support
Change-Id: I6ef9b7f4bb213dddddcf03b304ffedfd2f9e209b
2012-09-06 21:53:24 -07:00
Svetoslav Ganov
8e21d4df21 Merge "Adding accessibility check in the node provider of NumberPicker." into jb-mr1-dev 2012-09-06 20:00:19 -07:00
Svetoslav Ganov
a909276298 Adding accessibility check in the node provider of NumberPicker.
1. The node provide in number picker was sending accessibility events
   without checking whether accessibility is enabled leading to a
   crash if accessibility is disable when the event is sent.

bug:7095330

Change-Id: I2e14b757003b4db58922cf6e20ea8e119770e567
2012-09-06 19:57:05 -07:00
Svetoslav Ganov
01fa888903 Merge "Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo." into jb-mr1-dev 2012-09-06 19:43:54 -07:00
Svetoslav Ganov
eb9862fd4c Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo.
1. The feedback type provided by braille devices differs from all
   already predefined types and this change defines braille
   feedback type. Braille does not fit in the already predefined
   categories.

bug:6998945

Change-Id: Ide6043bed03fdecd6d2ee45a08762f5bd07a2118
2012-09-06 19:40:34 -07:00
Svetoslav Ganov
4b15ab66a0 Fixing the build
Change-Id: I123b128f5d9e50653d8d4ed73ea07920b370b0fb
2012-09-06 19:30:14 -07:00
Christopher Tate
f92b57ca8b Merge "Don't use toArray() inappropriately" into jb-mr1-dev 2012-09-06 19:21:31 -07:00
Christopher Tate
a96798e4a5 Don't use toArray() inappropriately
HashSet<String>.toArray() does not give you an array of strings.

Change-Id: I2053e714b12eab718aaf75d92bbc0625745b9932
2012-09-06 19:17:45 -07:00
Svetoslav Ganov
52832e0c4f Merge "Granular navigation not possible in edit text if the view has content description." into jb-mr1-dev 2012-09-06 19:14:31 -07:00
Svetoslav Ganov
2f4bf52d2c Granular navigation not possible in edit text if the view has content description.
1. We were giving precedence of content description over text and this is
   what content description is supposed to do - override the text. However,
   putting content description on an EditText by mistake would render the
   text view not navigable which is pretty much unusable. Now we are giving
   precedence to the text and use the content description as a fall back if
   text is empty.

bug:7078382

Change-Id: I00882ace149344478b127124bd5e641903e1b756
2012-09-06 19:08:26 -07:00
Svetoslav Ganov
3540f1f28b Merge "Granular navigation uses mContentDescription instead of getCpontentDescription()s" into jb-mr1-dev 2012-09-06 19:06:37 -07:00
Svetoslav Ganov
05282aa43e Granular navigation uses mContentDescription instead of getCpontentDescription()s
1. Getting the value of the content description via the method since
   there is nothing preventing developers to override the method to
   return a desired value (they should not do that but it is feasible).

bug:7079008

Change-Id: Iaf5848e9b065454ebfefccf685415fbf034ae475
2012-09-06 19:06:12 -07:00
Svetoslav Ganov
6da5827193 Merge "Screen magnification - feature - framework." into jb-mr1-dev 2012-09-06 18:57:43 -07:00
Svetoslav Ganov
1cf70bbf96 Screen magnification - feature - framework.
This change is the initial check in of the screen magnification
feature. This feature enables magnification of the screen via
global gestures (assuming it has been enabled from settings)
to allow a low vision user to efficiently use an Android device.

Interaction model:

1. Triple tap toggles permanent screen magnification which is magnifying
   the area around the location of the triple tap. One can think of the
   location of the triple tap as the center of the magnified viewport.
   For example, a triple tap when not magnified would magnify the screen
   and leave it in a magnified state. A triple tapping when magnified would
   clear magnification and leave the screen in a not magnified state.

2. Triple tap and hold would magnify the screen if not magnified and enable
   viewport dragging mode until the finger goes up. One can think of this
   mode as a way to move the magnified viewport since the area around the
   moving finger will be magnified to fit the screen. For example, if the
   screen was not magnified and the user triple taps and holds the screen
   would magnify and the viewport will follow the user's finger. When the
   finger goes up the screen will clear zoom out. If the same user interaction
   is performed when the screen is magnified, the viewport movement will
   be the same but when the finger goes up the screen will stay magnified.
   In other words, the initial magnified state is sticky.

3. Pinching with any number of additional fingers when viewport dragging
   is enabled, i.e. the user triple tapped and holds, would adjust the
   magnification scale which will become the current default magnification
   scale. The next time the user magnifies the same magnification scale
   would be used.

4. When in a permanent magnified state the user can use two or more fingers
   to pan the viewport. Note that in this mode the content is panned as
   opposed to the viewport dragging mode in which the viewport is moved.

5. When in a permanent magnified state the user can use three or more
   fingers to change the magnification scale which will become the current
   default magnification scale. The next time the user magnifies the same
   magnification scale would be used.

6. The magnification scale will be persisted in settings and in the cloud.

Note: Since two fingers are used to pan the content in a permanently magnified
   state no other two finger gestures in touch exploration or applications
   will work unless the uses zooms out to normal state where all gestures
   works as expected. This is an intentional tradeoff to allow efficient
   panning since in a permanently magnified state this would be the dominant
   action to be performed.

Design:

1. The window manager exposes APIs for setting accessibility transformation
   which is a scale and offsets for X and Y axis. The window manager queries
   the window policy for which windows will not be magnified. For example,
   the IME windows and the navigation bar are not magnified including windows
   that are attached to them.

2. The accessibility features such a screen magnification and touch
   exploration are now impemented as a sequence of transformations on the
   event stream. The accessibility manager service may request each
   of these features or both. The behavior of the features is not changed
   based on the fact that another one is enabled.

3. The screen magnifier keeps a viewport of the content that is magnified
   which is surrounded by a glow in a magnified state. Interactions outside
   of the viewport are delegated directly to the application without
   interpretation. For example, a triple tap on the letter 'a' of the IME
   would type three letters instead of toggling magnified state. The viewport
   is updated on screen rotation and on window transitions. For example,
   when the IME pops up the viewport shrinks.

4. The glow around the viewport is implemented as a special type of window
   that does not take input focus, cannot be touched, is laid out in the
   screen coordiates with width and height matching these of the screen.
   When the magnified region changes the root view of the window draws the
   hightlight but the size of the window does not change - unless a rotation
   happens. All changes in the viewport size or showing or hiding it are
   animated.

5. The viewport is encapsulated in a class that knows how to show,
   hide, and resize the viewport - potentially animating that.
   This class uses the new animation framework for animations.

6. The magnification is handled by a magnification controller that
   keeps track of the current trnasformation to be applied to the screen
   content and the desired such. If these two are not the same it is
   responsibility of the magnification controller to reconcile them by
   potentially animating the transition from one to the other.

7. A dipslay content observer wathces for winodw transitions, screen
   rotations, and when a rectange on the screen has been reqeusted. This
   class is responsible for handling interesting state changes such
   as changing the viewport bounds on IME pop up or screen rotation,
   panning the content to make a requested rectangle visible on the
   screen, etc.

8. To implement viewport updates the window manger was updated with APIs
   to watch for window transitions and when a rectangle has been requested
   on the screen. These APIs are protected by a signature level permission.
   Also a parcelable and poolable window info class has been added with
   APIs for getting the window info given the window token. This enables
   getting some useful information about a window. There APIs are also
   signature protected.

bug:6795382

Change-Id: Iec93da8bf6376beebbd4f5167ab7723dc7d9bd00
2012-09-06 18:56:17 -07:00
Jim Miller
c71d406060 Merge "Better layout for Face Unlock on 600dp tablet" into jb-mr1-dev 2012-09-06 18:56:03 -07:00
Jim Miller
a56f8f7ca2 Merge "Fix EmergencyDialer button on devices without telephony hardware" into jb-mr1-dev 2012-09-06 18:45:18 -07:00
Jeff Sharkey
2b0442f330 Merge "Event logging for lockdown VPN state changes." into jb-mr1-dev 2012-09-06 18:34:17 -07:00
Jeff Sharkey
91c6a64a04 Event logging for lockdown VPN state changes.
Bug: 7079350
Change-Id: I3670efe7f09c0fca55552b6a04a2be159b9beb3c
2012-09-06 18:33:14 -07:00
Fabrice Di Meglio
0af4b8b0c8 Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I8d76299090abf6b2b187696b1a83e71d7a44b1ce
2012-09-06 18:05:02 -07:00