85176 Commits

Author SHA1 Message Date
Amith Yamasani
95293865bd Fix build
Merge error...

Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6
2012-09-25 09:39:36 -07:00
Jean-Baptiste Queru
0dfe1cf3cd Merge into jb-mr1-dev
Change-Id: Id8bbccaa542bef3351958fb6749370880a1921f3
2012-09-25 09:37:51 -07:00
Jean-Baptiste Queru
07e35aa80b Merge into jb-mr1-dev
Change-Id: Ic72c475635a0eb57a77d3bd621a219001af8baa5
2012-09-25 09:37:11 -07:00
Jean-Baptiste Queru
7951c459ae Merge into jb-mr1-dev
Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618
2012-09-25 09:36:32 -07:00
Jean-Baptiste Queru
a5e1d21f56 Merge into jb-mr1-dev
Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7
2012-09-25 09:35:53 -07:00
Jean-Baptiste Queru
ec1996131d Merge into jb-mr1-dev
Change-Id: I97ff2551b36a1b590f2d314cabfcf198dd10f404
2012-09-25 09:35:19 -07:00
Jean-Baptiste Queru
7a7c6aa0c3 Merge into jb-mr1-dev
Change-Id: I821410e9ffcc7148139465c04ef335f0becc18c2
2012-09-25 09:34:45 -07:00
Jean-Baptiste Queru
641c36f918 Merge into jb-mr1-dev
Change-Id: Iec56e4962bbc78309b20595352cce986fe62f68e
2012-09-25 09:34:07 -07:00
Romain Guy
e83221c547 Fix alpha channel computation with ColorMatrixColorFilter
Bug #7222476

There were two issues:
- Blending was ignored with color filters
- The addition vector of a color filter was treated as integer values
  instead of float values

Change-Id: Id94065704a30ee8aaaa5724a9f3a3cff7c50ced7
2012-09-25 09:33:22 -07:00
Martijn Coenen
f8538594fe Fix build.
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
2012-09-25 09:31:50 -07:00
Jean-Baptiste Queru
1b24275976 Merge into jb-mr1-dev
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
2012-09-25 09:31:15 -07:00
Jean-Baptiste Queru
fd5be7087b Merge into jb-mr1-dev
Change-Id: Ic10d3201218c7045e03e563996ac04239c75b52c
2012-09-25 09:29:56 -07:00
Jean-Baptiste Queru
0de06b7e19 Merge into jb-mr1-dev
Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
2012-09-25 09:29:18 -07:00
Jean-Baptiste Queru
c68accd35e Merge into jb-mr1-dev
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
2012-09-25 09:28:32 -07:00
Jean-Baptiste Queru
ca94050705 Merge into jb-mr1-dev
Change-Id: I5a9970a011de789aaeb1c4c4ed58ae750071b135
2012-09-25 09:27:45 -07:00
Jean-Baptiste Queru
93fd0f7a83 Merge into jb-mr1-dev
Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3
2012-09-25 09:27:02 -07:00
Jean-Baptiste Queru
908a43234a Merge into jb-mr1-dev
Change-Id: I7b777c7a4818d699582419d2eb4fc1f5cc0f4f46
2012-09-25 09:26:09 -07:00
Jean-Baptiste Queru
6fb2514cdf Merge into jb-mr1-dev
Change-Id: I1baab28b12364213673ed7992207ad198491f286
2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7 Add NfcBarcode technology API.
Supporting only Kovio barcode technology for now.

Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
2012-09-25 09:22:16 -07:00
Daniel Sandler
5a8aefa6c8 No more double-swiping to toggle panels on tablets.
This also fixes up the drag regions so that quick settings
is only assigned the right 1/3 of the display (or 100dp,
whichever is larger). It had been that more than half of the
status bar, when dragged, would pull down QS.

Bug: 7217002
Change-Id: I515b6e19deab305b99784c7287d8f04fa9b22dc7
2012-09-25 10:20:00 -04:00
Daniel Sandler
666d47502b Return carrier label to notification panel.
If it makes you feel any better, it was there all along...

Bug: 7027535
Change-Id: Ib1add55f1bfe1958e15fa6a2960a821ccfb9d949
2012-09-25 01:21:06 -04:00
Jim Miller
7641506e3c Fix wrong password attempt count in DevicePolicyManager
Keyguard wasn't resetting dpm's count when a successful password
was made.  The result is the device would get wiped earlier than
it should.

Also fixes a TODO left over from keyguard refactoring that
allowed face unlock to trigger the same logic (ouch!).

Fixes bug 7219258

Change-Id: I2bd13c50a9beb8225d3237e86d5e34b73d0eb3cf
2012-09-24 19:31:29 -07:00
Svetoslav Ganov
76c0dd4827 The active window for accessibilitiy incorrectly tracked.
1. The active window for accessibility purposes is the either the
   window the user is touching or the window that has input focus. We
   were using the touch exploration gesture end event to figure
   when the user stops touching the screen so we can set the active
   window to the input focused one. However, we do not send such
   gesture end if the user does not touch explore. If the user only
   taps we do not consider this touch exploring. We now have dedicated
   accessibility events for first and last touch and this change uses
   them as a guide when to update the active window.

bug:6523219

Change-Id: I6262c0c5f408b02dbaa127664e4b426935d7f81f
2012-09-24 19:16:20 -07:00
Svetoslav Ganov
03e7b88815 More than one finger at a time can trigger a system crash.
1. The crash was happening if: two active pointers are performing a drag;
   there are some inactive pointers down; the main dragging pointer (we are
   merging the dragging pointers into one) goes up; now an inactive pointer
   goes up and the explorer tries to inject up for the dragging pointer
   which is no longer in the event resulting in a crash. Basically two
   problems: inactive pointers were not ignored; 2) having only one
   active pointer should not only send the up event but also transition
   the explorer in touch exploring state.

bug:6874128

Change-Id: I341fc360ebc074fe3919d5ba3b98ee5cb08dd71e
2012-09-24 18:43:30 -07:00
Jason Sams
ae760511d8 Test FS getElementAt
bug 7190126

Change-Id: I1fbaa77af051cf44134f8bfe56339ce5d3b7edbb
2012-09-24 17:42:14 -07:00
Irfan Sheriff
59358536d2 Update doc on getConfiguredNetworks
BUg: 7223590
Change-Id: Id92699ae48ea75f94638fcc3bd776b863911985b
2012-09-24 17:36:19 -07:00
Jeff Brown
3671410b9e Fix dialogs on secondary displays.
Bug: 7183618
Change-Id: I65b650a0c423f3081c412a7341b7427b6ac85e24
2012-09-24 17:36:06 -07:00
Jason Sams
85d4955a13 Add test for copy kernels.
bug 7224526

Change-Id: I76e1e63b6bd53d84df9c60a61e6588b21f33c2e3
2012-09-24 17:27:59 -07:00
Amith Yamasani
ea7e91514e AppInfo from Notifications for secondary users
Required wiring up startActivitiesAsUser()

Bug: 7224950

Also fix a bug in navigateUp in secondary user

Change-Id: I114ae2de0457362d62e899fdb94b12239a3eb778
2012-09-24 17:19:03 -07:00
Victoria Lease
1925e290e7 getBestProvider() prefers GPS over NLP
Preferring the GPS location provider over NLP should produce better
average and worst-case results than NLP, which is very accurate in
certain conditions and completely useless in others.

Bug: 7182301
Change-Id: If7d50f0d3ac663cbfd84b7033adc204c11bcaca4
2012-09-24 17:00:18 -07:00
Svetoslav Ganov
187f3f9490 Magnified frame not properly computed when keyguard goes away.
1. The keyguard force hides some windows when it is shown and as soon
   as the keyguard goes away there windows are made visible. However,
   the window transition that the keyguard is moving away is reported
   before the force hidden windows are shown which makes the screen
   magnifier compute the magnified region with an incomplete list of
   windows of interest.

bug:7215285

Change-Id: I3abc4d97b7a74de8183ad20477dadf66c82da037
2012-09-24 16:34:26 -07:00
Kristian Monsen
d0b90d30d8 Hiding a method for JB-MR1
This one got left out in the last round of method hiding.

This got lost in the last round of method hiding.

Change-Id: I3c6aa234dd29933cb32d0cd91830d47289e7e639
2012-09-24 19:11:30 -04:00
Chris Wren
482410de94 reduce notification pad on large displays.
Bug:7053073
Change-Id: Icbb98ba31b79e25ca37757bf6e898f2575c0e487
2012-09-24 18:41:18 -04:00
Romain Guy
4c7dc4aa5c Add extra error check when eglCreateContext fails
Bug #7216919

Change-Id: I322cbe4579d7a4eb2a64d288175e145d0badc857
2012-09-24 15:35:33 -07:00
Jeff Brown
8d0243a3d0 Fix surface view on secondary display.
Bug: 7183618
Change-Id: I8d743b5db8f362afb97f720846d990f9a722b3bd
2012-09-24 15:02:15 -07:00
Michael Jurka
7ae188335e Merge "Fix build" into jb-mr1-dev 2012-09-24 14:57:15 -07:00
Michael Jurka
0988524683 Fix build
Change-Id: I476664d9c0116fb4b135d443dd36ee7ebe3c25f4
2012-09-24 14:42:01 -07:00
Jeff Brown
14a9f2b9d2 Fix drag and drop surfaces on secondary displays.
Bug: 7183618
Change-Id: I4ef746916aad984640f1eb3b3c71b1e34595aabd
2012-09-24 14:37:31 -07:00
Jeff Brown
2033763bb1 Allow a window on a secondary display to have focus.
If any window on the default display has focus, then it
gets focus as usual.  If no window on the default display
has focus, then we consider windows on the secondary display.

In the future we will need more elaborate schemes for
managing focus across multiple displays, but this is enough
for testing purposes now.

Bug: 7183618
Change-Id: I21ddb9904eb9e574e42d28743aeca51f4ffebf64
2012-09-24 14:37:30 -07:00
Jeff Brown
efd43bdb83 Force activities to run on the second display for testing.
This is a simple hack for testing and development purposes.
It makes the framework place the main window of an activity
on to a secondary display instead of on the default display.

Set the "debug.second-display.pkg" to a substring of the
package name of the activity that you want to have show
up on the secondary display, such as "com.example.android.apis"

Bug: 7183618
Change-Id: I0a9e7f27c8ff253253b9de57d4bc49f31d95a0e2
2012-09-24 14:37:25 -07:00
Adam Powell
9ceac5a02f TaskStackBuilder and intents without an explicit target
When Activity#getParentActivityIntent() returns an Intent without an
explicit target, resolve it in order to determine a correct parent
stack.

Bug 7223318

Change-Id: I3e88129f1e538cc3d932d6b4f735a5bec54bb4ad
2012-09-24 14:28:44 -07:00
Jason Sams
816153b0b2 Merge "Test image for 2 input tests." into jb-mr1-dev 2012-09-24 14:25:21 -07:00
Dianne Hackborn
139748fd72 Fix issue #7215984: java.lang.RuntimeException: Unable to create...
...service com.android.systemui.SystemUIService: java.lang.NullPointerException

- Don't acquire the activity manager lock in handleIncomingUser(),
  there is really no need to do so.
- Rework the settings provider client side cache code to not hold
  locks while calling into the provider.

I also changed the way the settings provider uses system properties
so that there is one property for all users.  We can't do one per
user, since the system property name space is limited with a fixed
size.  And we don't really need to do that; the worse that happens
by combining all users is that if one running user changes one of its
settings, all other running users will think they need to reload
settings when they go to fetch them next.

Change-Id: I13b90b832310d117eb6d721aacd122cfba7d749a
2012-09-24 14:15:14 -07:00
Svetoslav Ganov
270a331cae Merge "UI test automation service should not be auto reconnected." into jb-mr1-dev 2012-09-24 13:58:22 -07:00
Svetoslav Ganov
657968a65f UI test automation service should not be auto reconnected.
1. Since adb is restarted on user switch it makes no sense to
   try to reconnect the ui automation service since it will
   be killed on a user switch.

   Disabling touch exploration on UI automation service
   connect since it can explicitly put the device in this
   state if needed.

bug:6967373

Change-Id: I8cfde74f28f3f03d4ccf24746d43b8178ae2b5ef
2012-09-24 13:50:44 -07:00
Daniel Sandler
598cfcad42 Merge "Properly launch quicksettings activities." into jb-mr1-dev 2012-09-24 13:42:36 -07:00
Baligh Uddin
583fab5e99 Import translations. DO NOT MERGE
Change-Id: I54dbefbe0ed8fc87bc3f0f8123f4c5185f125192
Auto-generated-cl: translation import
2012-09-24 13:21:40 -07:00
Sara Ting
4d6f90ea50 Adding support for new 'uid2445' column in Calendar's Events table.
Bug:7029852
Change-Id: I4fdf86ba44f5c7bdcc55e8c2bdf664dddbe671f5
2012-09-24 13:09:35 -07:00
Bart Sears
4249be40bd Merge "Updated versions of DroidSansFallback" into jb-mr1-dev 2012-09-24 13:06:37 -07:00
Jeff Sharkey
7d8bcb498d Move multi-user OBB under user-specific path.
Bug: 7212801
Change-Id: I0ab83c1d9cb21914d61a7da45a32e89956e22ec8
2012-09-24 13:03:35 -07:00