OSDN Git Service

android-x86/frameworks-base.git
11 years agoMerge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction"...
Fabrice Di Meglio [Fri, 7 Sep 2012 17:19:04 +0000 (10:19 -0700)]
Merge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction" into jb-mr1-dev

11 years agoMerge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb...
Fabrice Di Meglio [Fri, 7 Sep 2012 17:17:55 +0000 (10:17 -0700)]
Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev

11 years agoMerge "Add context support to backdropper filter." into jb-mr1-dev
Mike Dodd [Fri, 7 Sep 2012 15:43:35 +0000 (08:43 -0700)]
Merge "Add context support to backdropper filter." into jb-mr1-dev

11 years agoMerge "Audio Effects test app" into jb-mr1-dev
Marco Nelissen [Fri, 7 Sep 2012 14:41:17 +0000 (07:41 -0700)]
Merge "Audio Effects test app" into jb-mr1-dev

11 years agoMerge "Fault tolerance in Bluedroid" into jb-mr1-dev
Matthew Xie [Fri, 7 Sep 2012 07:07:23 +0000 (00:07 -0700)]
Merge "Fault tolerance in Bluedroid" into jb-mr1-dev

11 years agoFault tolerance in Bluedroid
Syed Ibrahim M [Wed, 29 Aug 2012 12:37:26 +0000 (18:07 +0530)]
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

11 years agoInclude primary flag in StorageVolume.
Jeff Sharkey [Fri, 7 Sep 2012 05:46:30 +0000 (22:46 -0700)]
Include primary flag in StorageVolume.

Bug: 7003520
Change-Id: Iaae2ae22253820c954c51e0199c31087bc825f3f

11 years agoLet Pair represent null values.
Jeff Sharkey [Fri, 7 Sep 2012 03:32:16 +0000 (20:32 -0700)]
Let Pair represent null values.

Bug: 7121262
Change-Id: I067ea0a4af40a0e8935a9408404df7a2e851e22c

11 years agoMark all settings upgrade transactions as successful along the way
Christopher Tate [Fri, 7 Sep 2012 05:17:43 +0000 (22:17 -0700)]
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

11 years agoMerge "Adding accessibility check in the node provider of NumberPicker." into jb...
Svetoslav Ganov [Fri, 7 Sep 2012 03:00:19 +0000 (20:00 -0700)]
Merge "Adding accessibility check in the node provider of NumberPicker." into jb-mr1-dev

11 years agoAdding accessibility check in the node provider of NumberPicker.
Svetoslav Ganov [Fri, 7 Sep 2012 02:57:00 +0000 (19:57 -0700)]
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

11 years agoMerge "Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo." into jb-mr1-dev
Svetoslav Ganov [Fri, 7 Sep 2012 02:43:54 +0000 (19:43 -0700)]
Merge "Adding FEEDBACK_BRAILLE to AccessibilityServiceInfo." into jb-mr1-dev

11 years agoAdding FEEDBACK_BRAILLE to AccessibilityServiceInfo.
Svetoslav Ganov [Fri, 7 Sep 2012 02:40:29 +0000 (19:40 -0700)]
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

11 years agoFixing the build
Svetoslav Ganov [Fri, 7 Sep 2012 02:25:53 +0000 (19:25 -0700)]
Fixing the build

Change-Id: I123b128f5d9e50653d8d4ed73ea07920b370b0fb

11 years agoMerge "Don't use toArray() inappropriately" into jb-mr1-dev
Christopher Tate [Fri, 7 Sep 2012 02:21:30 +0000 (19:21 -0700)]
Merge "Don't use toArray() inappropriately" into jb-mr1-dev

11 years agoDon't use toArray() inappropriately
Christopher Tate [Fri, 7 Sep 2012 02:07:19 +0000 (19:07 -0700)]
Don't use toArray() inappropriately

HashSet<String>.toArray() does not give you an array of strings.

Change-Id: I2053e714b12eab718aaf75d92bbc0625745b9932

11 years agoMerge "Granular navigation not possible in edit text if the view has content descript...
Svetoslav Ganov [Fri, 7 Sep 2012 02:14:30 +0000 (19:14 -0700)]
Merge "Granular navigation not possible in edit text if the view has content description." into jb-mr1-dev

11 years agoGranular navigation not possible in edit text if the view has content description.
Svetoslav Ganov [Fri, 7 Sep 2012 02:07:44 +0000 (19:07 -0700)]
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

11 years agoMerge "Granular navigation uses mContentDescription instead of getCpontentDescription...
Svetoslav Ganov [Fri, 7 Sep 2012 02:06:37 +0000 (19:06 -0700)]
Merge "Granular navigation uses mContentDescription instead of getCpontentDescription()s" into jb-mr1-dev

11 years agoGranular navigation uses mContentDescription instead of getCpontentDescription()s
Svetoslav Ganov [Fri, 7 Sep 2012 01:59:29 +0000 (18:59 -0700)]
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

11 years agoMerge "Screen magnification - feature - framework." into jb-mr1-dev
Svetoslav Ganov [Fri, 7 Sep 2012 01:57:43 +0000 (18:57 -0700)]
Merge "Screen magnification - feature - framework." into jb-mr1-dev

11 years agoScreen magnification - feature - framework.
Svetoslav Ganov [Mon, 6 Aug 2012 17:53:34 +0000 (10:53 -0700)]
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

11 years agoMerge "Better layout for Face Unlock on 600dp tablet" into jb-mr1-dev
Jim Miller [Fri, 7 Sep 2012 01:56:03 +0000 (18:56 -0700)]
Merge "Better layout for Face Unlock on 600dp tablet" into jb-mr1-dev

11 years agoMerge "Fix EmergencyDialer button on devices without telephony hardware" into jb...
Jim Miller [Fri, 7 Sep 2012 01:45:18 +0000 (18:45 -0700)]
Merge "Fix EmergencyDialer button on devices without telephony hardware" into jb-mr1-dev

11 years agoMerge "Event logging for lockdown VPN state changes." into jb-mr1-dev
Jeff Sharkey [Fri, 7 Sep 2012 01:34:17 +0000 (18:34 -0700)]
Merge "Event logging for lockdown VPN state changes." into jb-mr1-dev

11 years agoEvent logging for lockdown VPN state changes.
Jeff Sharkey [Fri, 7 Sep 2012 01:33:14 +0000 (18:33 -0700)]
Event logging for lockdown VPN state changes.

Bug: 7079350
Change-Id: I3670efe7f09c0fca55552b6a04a2be159b9beb3c

11 years agoMake ProgressBar / SeekBar / RatingBar widgets aware of layout direction
Fabrice Di Meglio [Tue, 12 Jun 2012 01:30:05 +0000 (18:30 -0700)]
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

11 years agoMerge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev
Jeff Sharkey [Fri, 7 Sep 2012 01:02:44 +0000 (18:02 -0700)]
Merge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev

11 years agoMerge "Add wireless to KeyguardUpdateMonitor isPluggedIn" into jb-mr1-dev
Brian Muramatsu [Fri, 7 Sep 2012 00:59:36 +0000 (17:59 -0700)]
Merge "Add wireless to KeyguardUpdateMonitor isPluggedIn" into jb-mr1-dev

11 years agoRestrict lockdown and firewall to AID_SYSTEM.
Jeff Sharkey [Fri, 7 Sep 2012 00:54:29 +0000 (17:54 -0700)]
Restrict lockdown and firewall to AID_SYSTEM.

Bug: 7076289
Change-Id: Iafa3054335e8b1c3c8c3b8db2a4191d4ed4c8c41

11 years agoMerge "Add connection broadcast on group creation failure" into jb-mr1-dev
Irfan Sheriff [Fri, 7 Sep 2012 00:56:16 +0000 (17:56 -0700)]
Merge "Add connection broadcast on group creation failure" into jb-mr1-dev

11 years agoBetter layout for Face Unlock on 600dp tablet
Jim Miller [Fri, 7 Sep 2012 00:55:04 +0000 (17:55 -0700)]
Better layout for Face Unlock on 600dp tablet

Change-Id: I1deac516253e8ea7c5138344353b41daac1f5eab

11 years agoFix EmergencyDialer button on devices without telephony hardware
Jim Miller [Fri, 7 Sep 2012 00:51:12 +0000 (17:51 -0700)]
Fix EmergencyDialer button on devices without telephony hardware

This fixes showing the emergency dialer on devices without telephony.
Two fixes were required: 1. Move emergency dialer code to the view
that contains it (KeyguardSelectorView).  2. Always call onPause()
or onResume() in onScreenTurnedOff() and onScreenTurnedOn(), respectively.

Fixes bug 7117895

Change-Id: I96769fdda8478b6b60f46f7470bed2279ea2de72

11 years agoAdd connection broadcast on group creation failure
Irfan Sheriff [Thu, 6 Sep 2012 21:19:30 +0000 (14:19 -0700)]
Add connection broadcast on group creation failure

Change-Id: I8075a53997d968e6926e5ca78c9aadc60d8fcb2a

11 years agoMerge "Fix m11 to be Y scale instead of X" into jb-mr1-dev
Chris Craik [Fri, 7 Sep 2012 00:00:58 +0000 (17:00 -0700)]
Merge "Fix m11 to be Y scale instead of X" into jb-mr1-dev

11 years agoAdd context support to backdropper filter.
Mike Dodd [Fri, 7 Sep 2012 00:00:38 +0000 (17:00 -0700)]
Add context support to backdropper filter.

Part of b/7028438

Change-Id: Idcae38b452abc847c7b869a5568d1c5d831411b7

11 years agoFix m11 to be Y scale instead of X
Chris Craik [Thu, 6 Sep 2012 23:44:51 +0000 (16:44 -0700)]
Fix m11 to be Y scale instead of X

bug:7114630

Fixes different X and Y values resulting in blurry lines/rects.

Change-Id: I3eb244e0cf769efa6b38d08741cf37d0bf62b786

11 years agoPer-user settings
Christopher Tate [Fri, 24 Aug 2012 22:29:27 +0000 (15:29 -0700)]
Per-user settings

Each user has its own Settings.System.* and Settings.Secure.* namespace now.  In
addition, this CL introduces the new Settings.Global.* namespace, which contains
a number of previously-elsewhere named settings entities; these Global.* entities
are common to all users.  Because these elements have been moved from their prior
existence in the other namespaces, attempts to access them under their old names
and namespaces are detected and redirected (with appropriate compile-time and
logging messages) to their new homes.

The new Global.* namespace can only be written by system-level code, just like
the existing Secure.* namespace.  If an app attempts to write a key that was
previously in the System.* namespace but has been moved to the Global.* namespace,
then a warning is logged and no write is performed; the action is a no-op.  (The
app is explicitly not crashed, to avoid breaking well-behaved apps that can't
know any better.)

There is also now a hidden API for getting/setting settings entities associated
with a user other than the caller's.  Reading/writing data for a user other than
yourself requires the signature-level INTERACT_ACROSS_USERS_FULL permission.

Manipulating data for a different user cannot be done via the ContentProvider
query() / insert() APIs; you must use the Settings.get/put APIs for that degree
of control.  In general, use of the get/set API is *strongly* preferred over
query-type access to Settings.

Bug 6985398

Change-Id: Ibee54ddff99fb847c8c2479c23b50f1e7524d724

11 years agoMerge "Limit certain actions to default Display." into jb-mr1-dev
Craig Mautner [Thu, 6 Sep 2012 23:30:33 +0000 (16:30 -0700)]
Merge "Limit certain actions to default Display." into jb-mr1-dev

11 years agoMerge "Convert resized() method to new parameters." into jb-mr1-dev
Craig Mautner [Thu, 6 Sep 2012 22:07:46 +0000 (15:07 -0700)]
Merge "Convert resized() method to new parameters." into jb-mr1-dev

11 years agoMerge "Don't trigger log for empty views" into jb-mr1-dev
Chris Craik [Thu, 6 Sep 2012 22:05:38 +0000 (15:05 -0700)]
Merge "Don't trigger log for empty views" into jb-mr1-dev

11 years agoConvert resized() method to new parameters.
Craig Mautner [Thu, 6 Sep 2012 22:04:22 +0000 (15:04 -0700)]
Convert resized() method to new parameters.

When the BaseIWindow.resized method got switched from taking (int x,
int y, ...) to taking (Rect, ...) the SurfaceView.MyWindow override
never got updated.

Fixes bug 6992324.

Change-Id: Id0b9625559ae0100336f4573f09d313138c8a6e7

11 years agoDon't trigger log for empty views
Chris Craik [Thu, 6 Sep 2012 21:56:39 +0000 (14:56 -0700)]
Don't trigger log for empty views

Change-Id: Idb2193d6dd064e5c4af1f02d0df2a83a7db0e0f8

11 years agoMerge "Add secure setting for package verification" into jb-mr1-dev
rich cannings [Thu, 6 Sep 2012 21:55:54 +0000 (14:55 -0700)]
Merge "Add secure setting for package verification" into jb-mr1-dev

11 years agoMerge "Log if a view fails to fit in the drawing cache" into jb-mr1-dev
Chris Craik [Thu, 6 Sep 2012 21:49:17 +0000 (14:49 -0700)]
Merge "Log if a view fails to fit in the drawing cache" into jb-mr1-dev

11 years agoLog if a view fails to fit in the drawing cache
Chris Craik [Thu, 6 Sep 2012 21:42:44 +0000 (14:42 -0700)]
Log if a view fails to fit in the drawing cache

Large software layers won't draw if they're larger than the size of the drawing
cache, in which case this log will be triggered.

bug:7078391
Change-Id: Ib42a060b8e3b3642417df9243a086aa15b2989b1

11 years agoAdd secure setting for package verification
rich cannings [Thu, 6 Sep 2012 19:04:37 +0000 (12:04 -0700)]
Add secure setting for package verification

Framework changes to store and read a secure setting for package verification.
Default is on/true.

This setting will be turned on/off via the Settings app.

Bug: 7082362
Change-Id: I6f93d3136add8af0dbbdc664f0473c5f5b7e3fee

11 years agoIintial stab at multi-user switcher on Keyguard
Adam Cohen [Wed, 5 Sep 2012 23:23:58 +0000 (16:23 -0700)]
Iintial stab at multi-user switcher on Keyguard

Change-Id: I604a769ef43c354a8eeadb415e413c19ca02571d

11 years agoAudio Effects test app
Marco Nelissen [Thu, 6 Sep 2012 19:37:30 +0000 (12:37 -0700)]
Audio Effects test app

Change-Id: I93fff0e195af3205207ade32ab31f2a760574c7f

11 years agoam f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale...
Jean-Baptiste Queru [Thu, 6 Sep 2012 18:51:53 +0000 (11:51 -0700)]
am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit 'f66603e109d439e3a537cd3804706609ce86970e':
  Make SimpleSessionDescription locale safe

11 years agoam 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
Jean-Baptiste Queru [Thu, 6 Sep 2012 18:49:38 +0000 (11:49 -0700)]
am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit '3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2':
  Make SimpleSessionDescription locale safe

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 6 Sep 2012 18:47:29 +0000 (11:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoam bf3e62b8: Merge "Make SimpleSessionDescription locale safe"
Jean-Baptiste Queru [Thu, 6 Sep 2012 18:47:29 +0000 (11:47 -0700)]
am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

* commit 'bf3e62b8913fc2fb88d6bb454a6491424cbd40c5':
  Make SimpleSessionDescription locale safe

11 years agoMerge "Nested fragments." into jb-mr1-dev
Dianne Hackborn [Thu, 6 Sep 2012 18:41:47 +0000 (11:41 -0700)]
Merge "Nested fragments." into jb-mr1-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 6 Sep 2012 18:37:34 +0000 (11:37 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Make SimpleSessionDescription locale safe"
Jean-Baptiste Queru [Thu, 6 Sep 2012 18:22:29 +0000 (11:22 -0700)]
Merge "Make SimpleSessionDescription locale safe"

11 years agoUse "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
Fabrice Di Meglio [Wed, 5 Sep 2012 20:12:02 +0000 (13:12 -0700)]
Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources

- we cannot use "rtl" / "ltr" qualifiers as they can conflict with ISO-639 Alpha-3
codespace which uses 3 letters for identifying a language code (and could use either
"rtl" or "ltr" strings for defining a language in the future).

- we are using instead "ldrtl" for RTL and "ldltr" for LTR resources. Those qualifiers
are defined by more than 3 chars and outside of what is defined into ISO-639. They
are also more understandable as "ld" prefix is for "layoutdirection"

Change-Id: Id43e948103707e09bef63ebd54ac1779dde58e72

11 years agoNested fragments.
Dianne Hackborn [Wed, 5 Sep 2012 01:48:15 +0000 (18:48 -0700)]
Nested fragments.

Change-Id: I79acc19b391352c16b06afee2ca543223c38e364

11 years agoMerge "New "Start dreams" launcher shortcut." into jb-mr1-dev
Daniel Sandler [Thu, 6 Sep 2012 18:04:44 +0000 (11:04 -0700)]
Merge "New "Start dreams" launcher shortcut." into jb-mr1-dev

11 years agoMerge "Varying-based AA rect drawing" into jb-mr1-dev
Chris Craik [Thu, 6 Sep 2012 17:52:13 +0000 (10:52 -0700)]
Merge "Varying-based AA rect drawing" into jb-mr1-dev

11 years agoMerge "P2p API for WFD" into jb-mr1-dev
Irfan Sheriff [Thu, 6 Sep 2012 16:54:28 +0000 (09:54 -0700)]
Merge "P2p API for WFD" into jb-mr1-dev

11 years agoam 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display...
Jean-Baptiste Queru [Thu, 6 Sep 2012 16:18:20 +0000 (09:18 -0700)]
am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."

* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
  Musicplayer application can not display DRM files of internal storage.

11 years agoam 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files...
Jean-Baptiste Queru [Thu, 6 Sep 2012 16:16:09 +0000 (09:16 -0700)]
am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."

* commit '4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858':
  Musicplayer application can not display DRM files of internal storage.

11 years agoam 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Thu, 6 Sep 2012 16:13:45 +0000 (09:13 -0700)]
am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '1d9c5d8f18b7530c1e72fe86109707cddc198dbd':
  Revert "Update Back softkey icon Bug: 6020915"
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
  DO NOT MERGE Remove dead code
  DO NOT MERGE - Use focal point for scrolling in GestureDetector
  DO NOT MERGE - New implementation for ScaleGestureDetector
  Fix CDMA decoding of multipart UTF-16 SMS messages.

11 years agoam bb60bc26: Merge "Musicplayer application can not display DRM files of internal...
Jean-Baptiste Queru [Thu, 6 Sep 2012 16:12:17 +0000 (09:12 -0700)]
am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."

* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
  Musicplayer application can not display DRM files of internal storage.

11 years agoP2p API for WFD
Andreas Huber [Wed, 15 Aug 2012 23:16:31 +0000 (16:16 -0700)]
P2p API for WFD

Change-Id: I3914a515313654f7032d8bb102afebf0ed776783

11 years agoNew "Start dreams" launcher shortcut.
Daniel Sandler [Thu, 6 Sep 2012 05:22:59 +0000 (01:22 -0400)]
New "Start dreams" launcher shortcut.

Change-Id: Ice46fc8b99dae615e421ccf4eb6ca6f2a76cbe5f

11 years agoFix NPE in NdefRecord parser.
Martijn Coenen [Thu, 6 Sep 2012 15:09:06 +0000 (17:09 +0200)]
Fix NPE in NdefRecord parser.

Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5

11 years agoReconcile with jb-mr0-release jb-release - do not merge
The Android Open Source Project [Thu, 6 Sep 2012 15:08:54 +0000 (08:08 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I3ba16c8a37fd836c6c74dcfd1793f8bc1282b746

11 years agoMerge "Musicplayer application can not display DRM files of internal storage."
Jean-Baptiste Queru [Thu, 6 Sep 2012 14:20:59 +0000 (07:20 -0700)]
Merge "Musicplayer application can not display DRM files of internal storage."

11 years agoMerge "Fixing issue where recents items would go dim" into jb-mr1-dev
Michael Jurka [Thu, 6 Sep 2012 08:13:58 +0000 (01:13 -0700)]
Merge "Fixing issue where recents items would go dim" into jb-mr1-dev

11 years agoAdd wireless to KeyguardUpdateMonitor isPluggedIn
Brian Muramatsu [Thu, 6 Sep 2012 04:54:39 +0000 (21:54 -0700)]
Add wireless to KeyguardUpdateMonitor isPluggedIn

Bug 7114383

It looks like this wasn't carried over from the old keyguard.

Change-Id: I79d47ac36d84289a3afd9d6df6582a6c8e541181

11 years agoLimit certain actions to default Display.
Craig Mautner [Wed, 5 Sep 2012 20:07:13 +0000 (13:07 -0700)]
Limit certain actions to default Display.

Stop messing up PhoneWindowManager state when passing in windows
from non-default Display.

Change-Id: I472f7a13c5e2241fbf1f79ae1c8045fd92af016c

11 years agoCosmetic code changes to face unlock after review.
Jim Miller [Thu, 6 Sep 2012 01:54:18 +0000 (18:54 -0700)]
Cosmetic code changes to face unlock after review.

Change-Id: I6e4face14c1585ed7123ae9c055b5ac3ccc86395

11 years agoMerge "Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd"...
Jim Miller [Thu, 6 Sep 2012 01:25:43 +0000 (18:25 -0700)]
Merge "Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd" into jb-mr1-dev

11 years agoKeep local reference to KeyguardStatusViewManager so it doesn't get GC'd
Jim Miller [Thu, 6 Sep 2012 00:35:31 +0000 (17:35 -0700)]
Keep local reference to KeyguardStatusViewManager so it doesn't get GC'd

This fixes a bug where we'd stop updating the status view in keyguard
because KeyguardStatusViewManager had no references.

It also fixes a bug where KeyguardUpdateMonitor wasn't removing objects
because objects were being compared with WeakReferences rather than the
content of the WeakReferences.

Bug:7095359

Change-Id: I2d9df6097b2270655ad3662bcf7a6757e0515363

11 years agoMerge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev
Jim Miller [Wed, 5 Sep 2012 23:53:11 +0000 (16:53 -0700)]
Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev

11 years agoVarying-based AA rect drawing
Chris Craik [Sat, 1 Sep 2012 01:24:33 +0000 (18:24 -0700)]
Varying-based AA rect drawing

Instead of calculating opacity from relative position in the shader, use a
shader varying to do this computation for us.

bug:5045101

Also adds a test to HwAccelerationTest to show incorrect antialiasing in
scaled drawAARect / boundarySize calculation.

Change-Id: Icdc41acb01dc10ce354834f8389a5aed2f439162

11 years agoInitial pass at re-enabling face unlock in new keyguard.
Jim Miller [Tue, 4 Sep 2012 23:45:06 +0000 (16:45 -0700)]
Initial pass at re-enabling face unlock in new keyguard.

Change-Id: I187629f9c4bfd810f11c73416db6e41b56f09a45

11 years agoMerge "remove defunct javascript interface" into jb-mr1-dev
Selim Gurun [Wed, 5 Sep 2012 22:04:06 +0000 (15:04 -0700)]
Merge "remove defunct javascript interface" into jb-mr1-dev

11 years agoMerge "Stabilize perf data." into jb-mr1-dev
Jason Sams [Wed, 5 Sep 2012 20:50:36 +0000 (13:50 -0700)]
Merge "Stabilize perf data." into jb-mr1-dev

11 years agoMerge "Add ColorMatrix Intrinsic." into jb-mr1-dev
Jason Sams [Wed, 5 Sep 2012 20:48:58 +0000 (13:48 -0700)]
Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev

11 years agoMerge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev
Jim Miller [Wed, 5 Sep 2012 20:45:29 +0000 (13:45 -0700)]
Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev

11 years agoFixing issue where recents items would go dim
Michael Jurka [Wed, 5 Sep 2012 20:34:28 +0000 (13:34 -0700)]
Fixing issue where recents items would go dim

Bug: 6772614
Change-Id: I2f57f001d91d6cb445c58ac705e6c3ad1fa70dd3

11 years agoStabilize perf data.
Jason Sams [Wed, 5 Sep 2012 20:18:21 +0000 (13:18 -0700)]
Stabilize perf data.

Change-Id: I75fb31b1bb6e6a7a5a82b86fd4a6639dd328ceaa

11 years agoMerge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev
Jim Miller [Wed, 5 Sep 2012 19:49:30 +0000 (12:49 -0700)]
Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 5 Sep 2012 19:43:01 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0825c7b01d6c6a75e18de2531364c7fab66238bf
Auto-generated-cl: translation import

11 years agoMerge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev
Dmitry Shmidt [Wed, 5 Sep 2012 19:39:23 +0000 (12:39 -0700)]
Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev

11 years agoMerge changes I4ef284da,Ie8cc69bd into jb-mr1-dev
Daniel Sandler [Wed, 5 Sep 2012 19:38:24 +0000 (12:38 -0700)]
Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev

* changes:
  Make the SystemUI stop the screen saver when a full-screen notification is posted.
  Do not play sounds or vibes for background users' notifications.

11 years agoam 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all...
Jean-Baptiste Queru [Wed, 5 Sep 2012 19:36:04 +0000 (12:36 -0700)]
am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"

* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
  Am: Clean mLaunchingProviders of all providers started by the client

11 years agoRestore original default Wifi sleep policy (always)
Dmitry Shmidt [Wed, 5 Sep 2012 19:18:41 +0000 (12:18 -0700)]
Restore original default Wifi sleep policy (always)

BUG: b/7092819

Change-Id: I6ee6755fd04df2f0169f8602e60542c3591038f3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
11 years agoDon't depend on LockPatternUtils to get DevicePolicyManager
Jim Miller [Wed, 5 Sep 2012 19:17:55 +0000 (12:17 -0700)]
Don't depend on LockPatternUtils to get DevicePolicyManager

This fixes a crash where LockPatternUtils hasn't been set yet and
keyguard attempts to get the device policy for widgets.

This change breaks the dependency by getting a handle to DPM directly.

Bug:7109723

Change-Id: Iecae91474358821ebd30456648377253864c35cf

11 years agoresolved conflicts for merge of 7749a1c5 to jb-mr1-dev
Jean-Baptiste Queru [Wed, 5 Sep 2012 19:21:50 +0000 (12:21 -0700)]
resolved conflicts for merge of 7749a1c5 to jb-mr1-dev

Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 5 Sep 2012 19:17:50 +0000 (12:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I49e9d1c98c3f72140527cb978e7ef341f2532ce4
Auto-generated-cl: translation import

11 years agoam 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers start...
Jean-Baptiste Queru [Wed, 5 Sep 2012 19:12:56 +0000 (12:12 -0700)]
am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"

* commit '540995555505486074e9652a9c682bdf6e3056c5':
  Am: Clean mLaunchingProviders of all providers started by the client

11 years agoam b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine...
Jean-Baptiste Queru [Wed, 5 Sep 2012 19:12:52 +0000 (12:12 -0700)]
am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"

* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
  Make default value of auto-sync in SyncStorageEngine configurable

11 years agoam 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the...
Jean-Baptiste Queru [Wed, 5 Sep 2012 19:10:48 +0000 (12:10 -0700)]
am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"

* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
  Am: Clean mLaunchingProviders of all providers started by the client

11 years agoam 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
Jean-Baptiste Queru [Wed, 5 Sep 2012 19:10:44 +0000 (12:10 -0700)]
am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"

* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
  Make default value of auto-sync in SyncStorageEngine configurable

11 years agoMerge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failur...
Fabrice Di Meglio [Wed, 5 Sep 2012 19:03:32 +0000 (12:03 -0700)]
Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev

11 years agoam b693f6a9: am 8f58d381: older not lower
Scott Main [Wed, 5 Sep 2012 19:01:14 +0000 (12:01 -0700)]
am b693f6a9: am 8f58d381: older not lower

* commit 'b693f6a94ca2fa6bd4bba94363112bfd1aeb70ee':
  older not lower