Commit Graph

23414 Commits

Author SHA1 Message Date
Jeff Sharkey
bfdd680ab4 Migrate to @Override to remove warnings.
Bug: 6303344
Change-Id: I0d33b2ed448467379d576ccd71fb5ae20c878852
2012-04-09 10:57:21 -07:00
Adam Powell
081cc9a1f5 Merge "Tweaks to Activity up navigation" 2012-04-09 10:52:26 -07:00
Jeff Sharkey
4b3c523210 Merge "Splice operations before collapsing ifaces." 2012-04-09 10:31:20 -07:00
Adam Powell
04d5811500 Tweaks to Activity up navigation
Be more explicit in docs about getParentActivityIntent and guard against
calls when a parent has not been declared in the manifest.

Move automatic up navigation to happen after dispatch of the menu
selection event of id android.R.id.home to fragments. (Last.)

Fixes bug 6305357

Change-Id: I944e5c40774121f9a28250d8d98da6aa646f9357
2012-04-09 10:31:15 -07:00
Jeff Sharkey
21a547823d Splice operations before collapsing ifaces.
Bug: 6241038
Change-Id: Ide9058703f7305df8fb070af149ddce0653a0abf
2012-04-09 10:27:55 -07:00
Eric Laurent
079f09c6ca Merge "Added support for USB audio devices" 2012-04-09 08:39:05 -07:00
Daniel Sandler
d1404465df Merge "Remove Chronometer logspew." 2012-04-09 08:35:00 -07:00
Daniel Sandler
4879f1f183 Remove Chronometer logspew.
Change-Id: Ie9ea1ac9fb0b8053b00ce162c191dfa44c1ff6ab
2012-04-09 10:18:28 -04:00
Daniel Lehmann
63c115c4aa Merge "Expose NORMALIZED_NUMBER in the API" 2012-04-06 20:22:57 -07:00
Eric Laurent
59f482764e Added support for USB audio devices
Two types of USB audio devices are defined:
- USB audio device: the audio device in USB device mode while
the Android device is in USB host mode.
- USB audio accessory: the audio device in USB host mode while
the Android device is in USB device mode.

Renamed intents for analog and digital docks to avoid confusion:
 - ACTION_USB_ANLG_HEADSET_PLUG to ACTION_ANALOG_AUDIO_DOCK_PLUG
 - ACTION_USB_DGTL_HEADSET_PLUG to ACTION_DIGITAL_AUDIO_DOCK_PLUG

Factorized code in AudioService broadcast receiver.

Change-Id: I1b6d0257a9d68ecb9495c78c98bac8c67fec7891
2012-04-06 18:24:48 -07:00
Jeff Brown
69bba1dfb7 Merge "Add a unique input device descriptor." 2012-04-06 15:04:53 -07:00
Jeff Brown
e38fdfae91 Add a unique input device descriptor.
The purpose of the input device descriptor is to make it possible
to associate persistent settings for each input device, such as the
keyboard layout.

The descriptor is a hash of the information we have about the
device, such as its vendor id, product id, unique id, name,
or location.

Bug: 6110399
Change-Id: Idb80f946819b3f0dbf4e661bb0a753dbc2b60981
2012-04-06 14:57:19 -07:00
Gilles Debunne
43de94a943 Merge "Revert "Faster and simpler replace in SSB"" 2012-04-06 14:46:24 -07:00
Gilles Debunne
bc6862300f Revert "Faster and simpler replace in SSB"
Bug 6300658

This change reveals a weird race condition where sometimes the
text is entered twice. Adding a debugger slows down everything,
and the problem is no longer reproducable. Reverting for now.

This reverts commit ebd9a23817.
2012-04-06 14:37:46 -07:00
Christopher Tate
bf64e70f9b Merge "Attribute alarm broadcast wakelocks to the sender" 2012-04-06 14:35:16 -07:00
Christopher Tate
c4a07d1caa Attribute alarm broadcast wakelocks to the sender
Wakelock usage for the purpose of sending an alarm broadcast is now
attributed to the application which posted the alarm, not to the OS.

Bug 5911317

Change-Id: I8cb79c3bd5db467388716ab68285f4ab0bfe468b
2012-04-06 14:23:12 -07:00
Amith Yamasani
36dec4efa8 Merge "Fixes a bug in migration of lock settings to LockSettingsService." 2012-04-06 14:14:45 -07:00
Jeff Sharkey
a5372055d3 Merge "INetworkStatsSession with lifecycle for caching." 2012-04-06 13:40:41 -07:00
Jeff Sharkey
b52e3e5509 INetworkStatsSession with lifecycle for caching.
Users outside system_server now explicitly communicate their
lifecycle, which keeps a strong-reference chain to any fully loaded
NetworkStatsCollection histories.

Bug: 6236498
Change-Id: I8e22739b6e89a626b676967a736d7117fd000778
2012-04-06 13:38:29 -07:00
Dianne Hackborn
85d9e02094 Merge "Fix dumb bug." 2012-04-06 13:22:35 -07:00
Dianne Hackborn
5e4705a827 Fix dumb bug.
Change-Id: I5e0dfc0f03677888c22d938013299a8ec4597c69
2012-04-06 12:55:53 -07:00
Chris Craik
3d4d2159bc Merge "fix functor flag parsing, tweak process delay" 2012-04-06 12:51:36 -07:00
Mike Lockwood
5713c9cfa9 Merge "Add Intents to notify when USB audio devices or accessories are attached" 2012-04-06 11:29:25 -07:00
Dianne Hackborn
29d6fa9d8b Merge "Implement call log permission compatibility." 2012-04-06 11:11:32 -07:00
Mike Lockwood
9d5a4be05b Add Intents to notify when USB audio devices or accessories are attached
In this change, only the USB audio accessory support is implemented.

Change-Id: Id9b411319b07a96dc56649ca74cc5f3f89a55a7c
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-04-06 11:00:27 -07:00
Amith Yamasani
7ab8c4abca Fixes a bug in migration of lock settings to LockSettingsService.
Due to the code to handle backward compatibility, the migration
ended up being recursive.

Change-Id: I1c2cf4a81fbdee6a4b74cafb624625716c88cad3
2012-04-06 09:27:12 -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
Chris Craik
65924a3e56 fix functor flag parsing, tweak process delay
Change-Id: I0a679cc33f92ff6fd2e33db9ad58b52622def012
2012-04-05 17:52:11 -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
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
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
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
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
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