74265 Commits

Author SHA1 Message Date
yoonsung.nam
6be4fe371a Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-06 09:49:43 -07:00
Scott Main
cde2feb2c3 am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus
2012-04-06 09:43:14 -07:00
Alexander Lucas
5801ead919 am ad606697: Removed HTML artifact from index page
* commit 'ad6066970ae8f5979942178bcbbe90f72a348440':
  Removed HTML artifact from index page
2012-04-06 09:43:06 -07:00
Scott Main
5756da24ad am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '153f8fe420506a7e1b7a8f6b4d07db798867746e':
  docs: Android U: Displaying Bitmaps Efficiently
2012-04-06 09:42:57 -07:00
Trevor Johns
ae6323dd1e am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit 'e07b58506579085b62fde0771b74111b24aa27a0':
  Docs: Fixing typo in "Testing from Other IDEs" article
2012-04-06 09:42:55 -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
Daniel Sandler
aca9ef4ded Merge "Fix boot on sw600dp devices." 2012-04-06 08:46:52 -07:00
Craig Mautner
7a3bc87468 Merge "Fix so that windows again animate when moving." 2012-04-06 08:00:47 -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
Daniel Sandler
c8cb329147 Fix boot on sw600dp devices.
Soon we'll switch this threshold to 720dp, once the
PhoneStatusBar is ready to support 600dp wide devices. For
now, however, restore the previous behavior.

Bug: 6300512
Change-Id: Ibedb8ffc1b677e3bbe9af230598adb7db278635b
2012-04-05 23:57:26 -04: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
Craig Mautner
030711c39b Merge "Fix looping to turn off dimming." 2012-04-05 19:29:19 -07:00
Craig Mautner
6af9b92b75 Fix looping to turn off dimming.
Dimming was constantly being turned off if it wasn't time to turn it
on. This caused endless reentry into the Window Manager and consumed
lots of CPU.

Fixes bug 6293953.

Change-Id: Id87e60c7c70e96e66ce0b6297442f5ac0d2ff477
2012-04-05 19:25:51 -07:00
Romain Guy
9a5acaf90b Merge "Fix javadoc" 2012-04-05 19:06:55 -07:00
Romain Guy
17471d730f Fix javadoc
Change-Id: I41315ff2ff1b404de82264e6a56ee46032862a32
2012-04-05 19:04:56 -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
Dianne Hackborn
42c45856f5 Fix so that windows again animate when moving.
Change-Id: I2441d0c892687b8cda239815caf77837cd21093e
2012-04-05 18:29:35 -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
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
John Wang
2119ade6d7 Merge "Enhance Cell Location Api." 2012-04-05 16:51:32 -07:00
Dianne Hackborn
818e7e9c83 Merge "Dump KSM stats in the meminfo." 2012-04-05 16:46:08 -07:00
Adam Powell
dc417687a3 Fix build breakage
Change-Id: I228cb0bac2d926a3f17f6fb47f1e9461fac197ee
2012-04-05 16:30:14 -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
Scott Main
05b8594f5c am f030c948: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit 'f030c948b7866f49150b64b7ddab0fdc7f9f48b3':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus
2012-04-05 15:40:52 -07:00
Alexander Lucas
0f4b526d4b am 028e6dd6: am ad606697: Removed HTML artifact from index page
* commit '028e6dd6a9cd996a34459fd2471ad0708a461d05':
  Removed HTML artifact from index page
2012-04-05 15:40:51 -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
Dianne Hackborn
d3e677bc50 Dump KSM stats in the meminfo.
Change-Id: I077dcb137ed743ea10fde1dbba4e86c340dec432
2012-04-05 15:03:21 -07:00
JP Abgrall
35bb98d508 Merge "unlock screen: enable DEBUG and track pattern start/cell progress." 2012-04-05 14:55:09 -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
Scott Main
e6c567122b am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus
* commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus
2012-04-05 13:20:41 -07:00