74236 Commits

Author SHA1 Message Date
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
Scott Main
f030c948b7 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:28 -07:00
Craig Mautner
e4d8a5dd42 Fix failure to animate away exiting AppWindowToken
A previous check in changed the collection we were pulling exiting
AppWindowTokens from. Instead of pulling them from mExitingAppTokens
they came from mAppTokens and hence were not animated away.

Fixes bug 6296433.

Change-Id: I23347085658fce5412abb8ea119ce7e6152cab8b
2012-04-05 13:10:37 -07:00
Scott Main
2b0267dc36 docs: Deprecate the old UI guidelines about Activity/Task and Menus
Change-Id: Ife0079ecd2285eca92833a8ff32e9b4545086448
2012-04-05 13:08:55 -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
Alexander Lucas
3d7c8404da am ad606697: Removed HTML artifact from index page
* commit 'ad6066970ae8f5979942178bcbbe90f72a348440':
  Removed HTML artifact from index page
2012-04-05 11:43:35 -07:00
Alexander Lucas
028e6dd6a9 am ad606697: Removed HTML artifact from index page
* commit 'ad6066970ae8f5979942178bcbbe90f72a348440':
  Removed HTML artifact from index page
2012-04-05 11:43:21 -07:00
John Wang
963db55d59 Enhance Cell Location Api.
To boost accurary and enhance capability of cell location api,
two new APIs, TelephonyManager.getAllCellInfo() and
TelephonyManager.listen(LISTEN_CELL_INFO), are added. Two new
Class, CellInfo and CellIdentity, are created.

This API change returns all information of one cell locaiton
at the same time. It also provides additional LTE and timestamp information.

Change-Id: I4d0f813107e625ec4ac88c8d980ffd171aa5fc30
2012-04-05 11:30:37 -07:00
Alexander Lucas
ad6066970a Removed HTML artifact from index page
Change-Id: Ibeef033ea2051a91056e53774345c48697f73a39
2012-04-05 11:29:27 -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
Justin Koh
1c35d117f0 am db9b114b: Merge "Adds flag argument to setMasterMute." into ics-aah
* commit 'db9b114b2e1f9c2034c3cd6df00245b039d90c28':
  Adds flag argument to setMasterMute.
2012-04-05 10:43:06 -07:00
Justin Koh
db9b114b2e Merge "Adds flag argument to setMasterMute." into ics-aah 2012-04-05 10:40: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
Yu Shan Emily Lau
8fa23393e9 Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface." 2012-04-04 21:20:54 -07:00
Yu Shan Emily Lau
a79edb7233 Insert the 2 seconds before test start to
workaround the race conditon for requesting
the surface.

Change-Id: Ic8ba358400492860b0d38fc71468ea4bb4d3d7bd
2012-04-04 21:17:04 -07: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
Justin Koh
0273af55cf Adds flag argument to setMasterMute.
Adds flag argument to setMasterMute. This allows third parties to edit it
without showing the UI, for example.

TESTED = runs on Tungsten.

Change-Id: Idfd99a2476e60059cd93c9dfe07d03a389c3f5f5
2012-04-04 18:40:36 -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
Scott Main
7bf1ebd139 am 31361742: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '31361742b7a971f2998feac854e181dc100d5bf1':
  docs: Android U: Displaying Bitmaps Efficiently
2012-04-04 17:54:19 -07:00
Scott Main
31361742b7 am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '153f8fe420506a7e1b7a8f6b4d07db798867746e':
  docs: Android U: Displaying Bitmaps Efficiently
2012-04-04 17:51:08 -07:00