29535 Commits

Author SHA1 Message Date
Dianne Hackborn
29d6fa9d8b Merge "Implement call log permission compatibility." 2012-04-06 11:11:32 -07:00
Jamie Gennis
335a6625b6 Merge changes Iac9cc917,I8eed4b0d
* changes:
  TextureView: add setSurfaceTexture method
  SurfaceTexture: add GL context attach & detach
2012-04-06 09:06:28 -07:00
satok
419ad1e3b1 Merge "Fix a bug with IME blinking just after leaving the lock screen" 2012-04-05 22:12:36 -07:00
satok
f6710615c6 Supplement for I772164d9c67e95876c228efcce2
This should be merged with I1519258dd3ce95ad01

Change-Id: I48c5f86ff43f51913eb69d697bb1d75714b67aa3
2012-04-06 13:01:51 +09:00
Dianne Hackborn
31b0e0e86a Implement call log permission compatibility.
If a pre-JellyBean application requests read/write contacts, it
will implicitly be given read/write call log.

Change-Id: I029db4b09fda737bb8fba4e1611355ebdbbfd34f
2012-04-05 19:33:30 -07:00
Jeff Brown
ac14351e16 Move some APIs from window manager to input manager.
Simplified input injection API down to just one call.

Removed all input state reading API.  It was only used by the
window manager policy and required a permission that applications
could not obtain.  READ_INPUT_STATE is now unused and deprecated.

Change-Id: I41278141586ddee9468cae0fb59ff0dced6cbc00
2012-04-05 19:33:11 -07:00
Dianne Hackborn
e8644b695d Merge "Fix so that status bar doesn't resize when hiding nav bar." 2012-04-05 19:03:37 -07:00
Dianne Hackborn
9801435820 Fix so that status bar doesn't resize when hiding nav bar.
The status bar now extends behind the nav bar, and uses
fitsSystemWindows to ensure its content is not covered.  We
always report a stable content insets (as if the nav bar is
visible) even if the nav bar is hidden, so the content doesn't
jump when transitioing.  This does mean that if you only hide
the nav bar (and not the status bar), when in landscape you
will end up with a status bar whose right side still leaves
room for the nav bar.  But why the hell would you want to do
that?

Also improve documentation on setSystemUiVisibility().

Change-Id: I8087d875f1214ef0085a91b5ed5c2f35ff2fc1b3
2012-04-05 18:31:41 -07:00
Adam Powell
dab7850012 Merge "Fix a bug in TaskStackBuilder where task stack PendingIntents would not clear tasks properly." 2012-04-05 17:59:33 -07:00
Adam Powell
8ab700cbba Fix a bug in TaskStackBuilder where task stack PendingIntents would
not clear tasks properly.

Change-Id: I5a7918fa5e400c160409a45d3e00b32f6f4809aa
2012-04-05 17:54:10 -07:00
Jim Miller
4350498002 Merge "Fix 6216452: Add search target to lock screen" 2012-04-05 17:31:19 -07:00
Svetoslav Ganov
389b65fea2 Merge "Minor twaek to the focus behavior." 2012-04-05 17:23:56 -07:00
Svetoslav Ganov
5012ebbc5c Minor twaek to the focus behavior.
bug:6296603

Change-Id: I3bd0b291e6013cae019ca9049d9d3dc506845ab0
2012-04-05 17:22:19 -07:00
Jim Miller
c00fd7ab30 Fix 6216452: Add search target to lock screen
Change-Id: I0784e844fb8e1f904f37d2572c6ddbd6c22e95d1
2012-04-05 17:14:02 -07:00
Gilles Debunne
8b461b6936 Merge "Faster and simpler replace in SSB" 2012-04-05 17:03:46 -07:00
Jeff Sharkey
330401243e Merge "Support metered Wi-Fi NetworkPolicy." 2012-04-05 16:17:54 -07:00
Jamie Gennis
2af3524beb TextureView: add setSurfaceTexture method
This change adds support for transferring control of a TextureView's
SurfaceTexture between the UI framework and the application.  It makes the
TextureView detach the SurfaceTexture from the UI framework's GLES context
before calling the surfaceTextureDestroyed callback, allowing the app to use
the SurfaceTexture in its own GLES context if it so chooses.  This change also
adds the TextureView#setSurfaceTexture method, allowing an app have the
TextureView use a SurfaceTexture that already exists rather than creating a new
one.

Change-Id: Iac9cc917687e4239dd1c24eae553709aa37512da
2012-04-05 16:11:43 -07:00
Jamie Gennis
c6d9930777 SurfaceTexture: add GL context attach & detach
This change adds Java API support for detaching a SurfaceTexture from one GLES
context and then attaching it to a different one.

Change-Id: I8eed4b0d0e339c11598cb0408d9f4f2d99b3aa06
2012-04-05 16:11:43 -07:00
Jeff Sharkey
8fc27e8b87 Support metered Wi-Fi NetworkPolicy.
Add networkId field to NetworkIdentity to identify Wi-Fi networks by
SSID.  Add support for policies without usage cycles.

Only apply mobile policies when SIM state is ready, which is cleaner
than just checking for airplane mode.  Also avoids creating no-op
default policies when subscriberId is null.

Bug: 3001465, 3291052
Change-Id: I1f8aaa49a5db306df022c402ea7f3f5d4bc0cfc7
2012-04-05 16:02:25 -07:00
Jeff Brown
e9bdb31ea1 Merge "Refactor input system into its own service." 2012-04-05 15:30:10 -07:00
Jeff Brown
23b871d714 Merge "Initial commit of InputManager and keyboard layout API." 2012-04-05 15:29:24 -07:00
Brian Colonna
2cde1f97b8 Merge "Fix 5849324: Changed FUL extents for pattern backup" 2012-04-05 15:24:49 -07:00
Eric Fischer
22394c1c16 Merge "Import translations. DO NOT MERGE" 2012-04-05 15:11:39 -07:00
Amith Yamasani
2184a985da Merge "Lockscreen settings per user" 2012-04-05 14:43:22 -07:00
Jeff Brown
4532e61584 Refactor input system into its own service.
Extracted the input system from the window manager service into
a new input manager service.  This will make it easier to
offer new input-related features to applications.

Cleaned up the input manager service JNI layer somewhat to get rid
of all of the unnecessary checks for whether the input manager
had been initialized.  Simplified the callback layer as well.

Change-Id: I3175d01307aed1420780d3c093d2694b41edf66e
2012-04-05 14:42:11 -07:00
Jeff Brown
9df6e7a926 Initial commit of InputManager and keyboard layout API.
Added a new InputManager service for interacting with input
devices and configuring them.  This will be the focus of
an upcoming refactoring.

Added an API for registering keyboard layouts with the system
based on the use of a broadcast receiver.  Applications can
register their own keyboard layouts simply by declaring a
broadcast receiver in their manifests.

Added the skeleton of a package that will ultimately contain
the keyboard layouts and other input device related resources
that are part of the base system.

Bug: 6110399
Change-Id: Ie01b0ef4adbd5198f6f012e73964bdef3c51805c
2012-04-05 14:42:10 -07:00
Eric Fischer
e422b10f93 Import translations. DO NOT MERGE
Change-Id: I83bc71f4f6f9b0798e11314491d5e9b13f1a75fe
2012-04-05 14:19:40 -07:00
Amith Yamasani
52c489cd63 Lockscreen settings per user
Move all lockscreen related settings to LockSettingsService.
LockPatternUtils uses this through IPC instead of Secure settings.
Migrate old settings to new database managed by LockSettingsService.
Passwords and patterns are stored in a new per-user location, except
 for the primary user, for backward compatibility.
KeyguardViewMediator and LockPatternKeyguardView listen for changes
to user and updates the lockscreen.

Settings provider will look for Lock settings in the LockSettings
service now for the entries that used to be stored in Settings.

Change-Id: I956cd5b95e2d9d45a6401af7e270e6a5aa2dcc98
2012-04-05 14:03:36 -07:00
Brian Colonna
cf8d9073a6 Fix 5849324: Changed FUL extents for pattern backup
The extents of FUL when using PIN unlock are such that there are
4 dps of space between FUL and the adjacent text above and below.
The extents of FUL when using pattern backup were such that FUL
was very far below the adjacent text above.  Pattern backup is
now consistent with PIN backup - 4 dps of space between FUL and
the adjacent text above and below.

Note that it is not possible for FUL to be the same exact size
when using pattern backup vs. PIN backup because the rest of
the layout is different.  Making it a consistent distance from
the surrounding text is the best we can do.

To fix this, the FUL area simply had to cover an extra row in the
grid layout (a space view), and the top and bottom margins had to
be set to 4 dp.  Since only the FUL view is affected, it does not
impact the rest of the layout.

This has been tested on both a Prime and Crespo to make sure it
works across different size devices.  All lock methods have been
tested to make sure other methods were not affected.

Change-Id: I518f1b616cf7bedc510979d422ebc72e07a5aff4
2012-04-05 15:58:48 -04:00
Adam Powell
9828830611 Merge "TaskStackBuilder and Activity navigation features for framework" 2012-04-05 11:55:06 -07:00
Dianne Hackborn
5459c43b83 Merge "Clean up status bar, system bar, navigation bar management." 2012-04-05 11:47:02 -07:00
Adam Powell
dd8fab2629 TaskStackBuilder and Activity navigation features for framework
Promote navigation helpers from the support library to the core
platform.

The support library's meta-data element has been replaced with a
first-class parentActivityName attribute. This attribute is valid
on both activity and activity-alias elements. An activity-alias
will inherit the target activity's parentActivityName if one is
not explicitly specified.

Automatic Up navigation for Activities

Add the public method onNavigateUp() to Activity. The default
implementation will use the metadata supplied in the manifest about an
activity's hierarchical parent (parentActivityName) to do the right
thing.

If any activities in the parent chain require special Intent
arguments, the Activity subclass should override onNavigateUp() to
properly implement Up navigation for the app, supplying such arguments
as needed.

If automatic Up navigation within the same task can't find an activity
matching the supplied intent in the current task stack, it will act as
an in-app "home" and return to the root activity (presumably the app's
front page) in that task. (From this state, pressing "back" with
default behavior will return to the launcher.)

Change-Id: If163e27e59587f7af36975a09c986cb117ec3bc6
2012-04-05 11:45:10 -07:00
Martijn Coenen
5b4a57973c Merge "Make sure initial activity state is correct." 2012-04-05 11:17:03 -07:00
Martijn Coenen
20fe5378d7 Make sure initial activity state is correct.
Change-Id: Ic6199b42e59afa06a0f38f866e2924b84cd234b3
2012-04-05 11:10:29 -07:00
Martijn Coenen
d9966c4c21 Merge "Patch to support MIFARE with SAK 0x01" 2012-04-05 09:37:11 -07:00
satok
05a6cbe286 Fix a bug with IME blinking just after leaving the lock screen
Bug: 6286786
Change-Id: I9ee42482f7abffaefec31f0c4a661bef7c230137
2012-04-05 23:11:39 +09:00
Daniel Sandler
cde8aae955 Fix crash in legacy notification construction path.
Bug: 6293584
Change-Id: I8c1c5162a2e9e3ebc5a6d3fed045c6c6a64b9bfd
2012-04-04 23:46:19 -04:00
Romain Guy
5ab92c0316 Merge "Make sure we clean up after ourselves" 2012-04-04 19:47:34 -07:00
Bart Sears
837d321290 Merge "Update WebSettings.PREVIOUS_VERSION" 2012-04-04 19:36:54 -07:00
Svetoslav Ganov
b39e509f43 Merge "Fixing broken clear focus behavior." 2012-04-04 19:01:13 -07:00
Romain Guy
edbca1285e Make sure we clean up after ourselves
Because of the mAdded=false statement a few lines above, a large section
of doDie() was not executed. Things would eventually get cleaned up
but it seems better to do it at the right time.

Change-Id: I1a2f3a8e05057dd7cd7205b6d3f9c145d6c0241d
2012-04-04 18:25:53 -07:00
Romain Guy
a393bedb6d Merge "Add a new OnDrawListener to ViewRoot" 2012-04-04 18:16:38 -07:00
Romain Guy
25eba5c502 Add a new OnDrawListener to ViewRoot
This can be used by app to efficiently listen for draw passes. This listener
is guaranteed to not generate any garbage unlike OnPreDrawListener.

Change-Id: Ida40d11a3f8a5d2617bafe722906ee5c9af48602
2012-04-04 17:59:11 -07:00
Daniel Sandler
48200b6f3f Merge "Chronometer support in Notifications." 2012-04-04 17:49:24 -07:00
Svetoslav Ganov
57cadf2a97 Fixing broken clear focus behavior.
1. In a prevous patch I fixed the issues when on clearing
   focus of the first focusable view the callback for
   gaining focus were called before the ones for losing
   focus. Since it cause some issues the patch was reverted
   and resubmitted. In this chaos some code was missed so
   tests are failing. Added the missing logic to give focus
   to the first focusable in the current touch mode when
   a view loses focus.

2. Removed clear focusForRemoval methid since it is a dup
   of unFocus();

Note: All focus tests now pass.

Change-Id: I06881d4b5a66fc5a33efca16a96f20207a7220d3
2012-04-04 17:24:09 -07:00
Martijn Coenen
f47fcf702c Merge "First cut at Bluetooth Beam" 2012-04-04 16:51:40 -07:00
Bart Sears
4e2032b5fe Update WebSettings.PREVIOUS_VERSION
Now that we have released ICS MR1.1, update the PREVIOUS_VERSION
to 4.0.4.

Change-Id: I3c4d6abfa679f20776d2676c57af4c0347e41c7b
2012-04-04 16:13:26 -07:00
Dianne Hackborn
f87d19621d Clean up status bar, system bar, navigation bar management.
The status bar and navigation bar are two completely separate
elements, with their own semantics.  The system bar now classifies
itself as a navigation bar, since that is really how it behaves.

This required rewriting the HDMI resizing code, so that it is
all done by PhoneWindowManager since that is what is responsible
for the size of the navigation bar (and thus now system bar).  This
actually gets rid of a fair amount of code, and means we can also
do the same thing for a pure navigation bar.

Likewise the system bar now has the navigation bar ability to be
hidden when requested by system UI flags.  To get the behavior
we want on Xoom, we only allow the nav bar to be hidden when it
will help provide a better aspect ratio for showing widescreen
videos.

Finally the nav/system bar now animates when hidden and shown.

Change-Id: Ie927154b68376a0b61802f99171ff56b8da92e7a
2012-04-04 16:00:45 -07:00
Gilles Debunne
ebd9a23817 Faster and simpler replace in SSB
The original method was adding a suspicious space that was eventually
removed with a series of 3 calls to change.

This should not be necessary. I have tested this with various gap
positions and lengths, for all replace cases I could think of.

The test can not be added to the CTS as it would need to expose the
internal resizeFor and moveGapTo methods.

Change-Id: I194457fbcfd758fa69a7f380665cfd5ae4d3f1d4
2012-04-04 15:52:38 -07:00
Justin Koh
5ac69a23e0 Merge "resolved conflicts for merge of bff6a514 to master" 2012-04-04 14:54:19 -07:00