Commit Graph

41209 Commits

Author SHA1 Message Date
Craig Mautner
eb8abf7207 Introduce onNewActivityOptions for return activity
When an activity that is already translucent returns to the
previous activity using a scene transition the receiving activity
did not receive its ActivityOptions for its side of the animation.
The new method onNewActivityOptions() delivers those options.

Fixes bug 14869070.

Change-Id: I09b136b3213aae5d3521894e17a7500ac793f3d2
2014-07-07 12:48:50 -07:00
Igor Murashkin
af2b4ce90a Merge "camera2: Add crop region support and some other AE tags to legacy" 2014-07-02 18:22:50 +00:00
Igor Murashkin
df6242e374 camera2: Add crop region support and some other AE tags to legacy
Change-Id: If7a87b210a57ea13d6329bb363b1c7ecdadc52e8
2014-07-02 16:38:28 -07:00
Martijn Coenen
1a0fd95a46 Merge "Add API to query for AID prefix support." 2014-07-02 20:11:01 +00:00
Martijn Coenen
d92c168974 Add API to query for AID prefix support.
For future devices which may support
registering AID prefixes. Get the API in for now,
the actual implementation is pretty simple and
will follow later.

Change-Id: I6c16dae9a4dbc0f9cd84bdb61a4de93cffd278ec
2014-07-02 16:30:06 -07:00
Martijn Coenen
b92dc6b013 Clean up dynamic AID XML parser.
<aid-group> should be generated and parsed
in its own object.

Change-Id: I70f4511a682c66f8d11b7797a0f171cda24cc617
2014-07-02 14:11:54 -07:00
Craig Mautner
c0ffce5ddd Use cached thumbnails in Recent tasks.
The thumbnail returned from ActivityManager.getTaskThumbnail() now
contains either a Bitmap or a ParcelFileDescriptor that points to
a file containing a compressed Bitmap. The Recent tasks list is
now responsible for all thumbnail Bitmap caching as the activity
manager keeps only the most recent 5. This also permits low memory
devices to have many more tasks in the Recent tasks list.

As part of this CL the concept of subtasks is removed eliminating
code supporting the TaskAccessInfo and IThumbnailRetriever classes.

Fixes bug 15828934.

Change-Id: I0fd0320a1a04e3c78d79357899b83a2fff97abf2
2014-07-02 16:31:46 -07:00
Martijn Coenen
b51441163f Move AID validation to CardEmulation.
More logical place since it's a generic utility
function.

Change-Id: I3381f10d6720e415d091dbd475ef0df8733e7e75
2014-07-02 12:44:33 -07:00
Alan Viverette
396d485ba9 Merge "Add style for SearchView" 2014-07-02 18:17:00 +00:00
Alan Viverette
5dddb70b4e Add style for SearchView
BUG: 6420978
Change-Id: I31d9f7e66c2404388ccbe6d2e43a005deb0b7c25
2014-07-02 15:59:30 -07:00
Prerepa Viswanadham
0c116e1573 Obtain capabilities from chipset for it's support of various features
Change-Id: I01bdb31136be63e4e46fb4e054c902eddc5647ab
2014-07-02 21:24:37 +00:00
Martijn Coenen
c813dbbfb3 Merge "Clean up dynamic AID XML parser." 2014-07-02 18:22:50 +00:00
Tao Bai
f6e1112216 Enable new geolocation permission API.
BUG: 14668406
Change-Id: I9500154d14eceae0248eb3718de27fc33fef4f28
2014-07-02 20:38:14 +00:00
Martijn Coenen
8d61b67234 Merge "Move AID validation to CardEmulation." 2014-07-02 18:11:52 +00:00
dcashman
ca76cccb61 Merge "Initial work for key rotation." 2014-07-02 18:22:50 +00:00
dcashman
55b1078e2a Initial work for key rotation.
Introduces the upgrade-keyset tag to AndroidManifest.xml. This specifies a
KeySet by which an apk must be signed in order to update the app. Multiple
upgrade KeySets may be specified, in which case one of them must be used to
sign the updating apk.  If no upgrade-keyset is specified, the current logic
involving signatures is used.

Current Key Rotation Design Decisions:
-Apps using a shared user id may not rotate keys.
-All acceptable upgrade keysets must be specified, including the key signing
the app.  This enables key rotation in one update, but also 'locks' an app if
an incorrect upgrade keyset is specified.
-Minimal changes to existing KeySet code.

Bug: 6967056
Change-Id: Ib9bb693d4e9ea1aec375291ecdc182554890d29c
2014-07-02 12:51:28 -07:00
Ihab Awad
ad4cc9ba38 Merge "Rename Telecomm "Subscription" to "Account" (1/7)" 2014-07-02 18:22:50 +00:00
Ihab Awad
9c3f18846a Rename Telecomm "Subscription" to "Account" (1/7)
Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40

Conflicts:
	telecomm/java/android/telecomm/InCallCall.java
2014-07-02 12:27:13 -07:00
Alexandra Gherghina
1e1f2e8926 Merge "Adds per-user APIs required by the Settings app" 2014-07-02 16:34:47 +00:00
Alexandra Gherghina
cb22807ffc Adds per-user APIs required by the Settings app
Bug: 15466880
Change-Id: Ic99fbf074564901b04d32b08f3a7a38555f330b3
2014-07-02 13:34:14 +01:00
Santos Cordon
f90186d93e Add PhoneManager to expose functionality to phone/dialer apps.
Eventually, this will house the TelecommManager methods.

Change-Id: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5
2014-07-02 18:01:56 +00:00
Narayan Kamath
f29131f701 Merge "Fix native crashes when APKs can't be opened." 2014-07-01 19:11:01 +00:00
Narayan Kamath
cef0b39b92 Fix native crashes when APKs can't be opened.
There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.

Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.

bug: 15563874
(cherry picked from commit ec4516470d)

Change-Id: Ia35b464355467d0d36faf34fae85acbbab3f2896
2014-07-02 12:43:52 +01:00
Jinsuk Kim
160a6e5b99 Add setOption for HdmiControlService
Bug: 15845304
Change-Id: I96b285ae3938aeecdd44b2c08a178def33bd2bf2
2014-07-02 17:16:45 +09:00
Yohei Yukawa
8b4c1e953f Merge "Require coordinate transformation matrix if necessary" 2014-07-01 21:47:40 +00:00
Yohei Yukawa
b5268dcc17 Require coordinate transformation matrix if necessary
With this CL, CursorAnchorInfo.Builder#build() raises
IllegalArgumentException when an application author attempts to
instantiate CursorAnchorInfo without the coordinate
transformation matrix but with specifying some positional
parameters such as composing character rectangle.

Since any other positional members in CursorAnchorInfo are
supposed to be specified in local coordinates, the application
author must provide the coordinate transformation matrix for
such positional data.

Change-Id: I2b0fd0f146a2b95fe4fa1324837d8cfee667208c
2014-07-02 16:03:16 +09:00
Dianne Hackborn
497175beff Rework network stats to use proc state for fg/bg.
Switch to using the process state to determine whether a
process should be foreground or background, instead of the
boolean foreground given by the activity manager.

This is for battery save mode, where we can now allow more apps
to havenetwork access: everything whose process state is at
least IMPORTANT_FOREGROUND, which allows music playback
and other use-visible things to continue to have network
access.

Note this also impact the traditional background data disabled
state, where now we allow anything top or better to have
network access.  This automatically includes all persistent
processes, the current top activity, and any other processes
hosting the top activity or being used by the top activity.
So it broadens the set of apps that get network access, but I
think this increases it to a reasonable set of things that may
actually be needed for the foreground app to work correctly.

Change-Id: Icb609a2cea280dc3fa3e83417f478ed77f3685aa
2014-07-01 18:34:58 -07:00
Anish Athalye
677490eac4 Merge "Fix line breaking for clusters in narrow views" 2014-07-01 19:15:58 +00:00
Adam Powell
b3e411458c Fix a copy/paste bug in Toolbar.
Bug 15868762

Change-Id: Ie2a0c492f9d7baa05d520cd2fee652245ab4b61b
2014-07-01 17:42:34 -07:00
Nicolas Prevot
71420b8954 Merge "Returning badged icons for components of corporate apps." 2014-07-01 17:52:42 +00:00
Nicolas Prevot
7f7b0c759e Returning badged icons for components of corporate apps.
So, corporate apps in disambiguation dialogs are badged.
And updating the way we show the icon of the personal space to this new design.

BUG: 14377051

Change-Id: Idc707773a64a8feb2d9d4df88c425d5100542636
2014-07-02 12:09:51 +01:00
Przemyslaw Szczepaniak
c25427a6df Merge "Add support for audio session id in the TTS" 2014-07-01 17:52:42 +00:00
Przemyslaw Szczepaniak
5cbf17ca05 Add support for audio session id in the TTS
+ #playEarcon & #queueAudio respects request Volume/Pan settings.

Bug:15432115
Change-Id: I136afef77afbc56c34810c64123f7be4b431d378
2014-07-02 11:28:24 +01:00
Narayan Kamath
4fe15b23dc am 4161316f: am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '4161316f256c9cc047405a902bcfc17b3738b659':
  Fix broken assumptions in LocalePicker.
2014-07-02 10:11:12 +00:00
Narayan Kamath
4161316f25 am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '94171212431a45346e40fd97bbe72422e71f04be':
  Fix broken assumptions in LocalePicker.
2014-07-02 09:54:22 +00:00
Narayan Kamath
9417121243 am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '104da1e495cbed81e7ebe66b80344bf916b02391':
  Fix broken assumptions in LocalePicker.
2014-07-02 08:49:08 +00:00
Anish Athalye
9cd3bccdb2 Fix line breaking for clusters in narrow views
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
2014-07-01 16:39:39 +00:00
Niels Egberts
f8fd342091 First argument of playSilence is incorrect in javaDoc.
Change-Id: Icc059471e61fb6154108b74ea45cb06554d80631
2014-07-02 16:21:20 +00:00
Niels Egberts
795d777ee1 Forgot to deprecate a method in current.txt before merging earlier change.
Also includes a comment fix and line size changes in TextToSpeech.java.

Change-Id: Ia5842b694bca6cd9cae035164ffc605451e72d8b
2014-07-02 16:09:54 +00:00
Niels Egberts
df7deefe8e Support for CharSequences in the V1 API.
Two newly deprecated methods:
  - TextToSpeech.speak (over TextToSpeech.speak with mandatory utteranceId)
  - SynthesisRequest.getText (over SynthesisRequest.getCharSequenceText)

Change-Id: I8a75ed335c91074c72d6ef374ff8b9c79a7c208d
2014-07-02 15:23:33 +00:00
George Mount
82ffc141f5 Ensure views have been laid out before capturing the epicenter.
Bug 15992706

Change-Id: If245040b756882bcc82f56ef2c4563ce25c24e9e
2014-07-02 14:26:13 +00:00
John Reck
4cce48e63f Merge "Fixes to startDelay" 2014-07-02 05:06:31 +00:00
John Reck
8d8af3c1b7 Fixes to startDelay
Bug: 15991758

 Don't update the UI thread with final value until after
 startDelay

Change-Id: Ie8bffb5a3ace353ec1d82943a4efcbd01c42c28f
2014-07-01 15:32:12 -07:00
Paul Jensen
d7f67240a0 Merge "Make sure callback handler is in place before callbacks handled." 2014-07-01 16:28:20 +00:00
Paul Jensen
7221cc3bf3 Make sure callback handler is in place before callbacks handled.
When making Network requests in ConnectivityManager, make sure we install the
callback prior to a response from ConnectivityService arriving causing us to
search for the callback and inadvertently not find it.

bug:15928097
Change-Id: Ie5feb9cc8f5effc19870f54dba07218b2e11d82a
2014-07-02 13:50:53 +00:00
George Mount
00dde0bd46 Fix hang when there is no shared element in activity transition.
Bug 15990826

Change-Id: Id494a51baf8694abd6c5207389cd8334db485d1a
2014-07-02 13:50:09 +00:00
George Mount
238010f056 Allow activity transitions to target nav and status bar colors.
Bug 15885062

Action bar can already be targeted via android:action_bar.
Navigation bar background is now android:navigation:background.
Status bar background is now android:status:background.

Change-Id: I4604906923f3473af3beec4f865463b2fe4a5316
2014-07-02 06:58:38 -07:00
Jason Monk
1c7c319bb8 User restriction for disallowing window creation
Block any types of windows that could by used by apps to create
views on top of a locked app.  This can be used by device admins
in conjunction with lock task mode.

Added a way for system (and priv apps) to bypass user restrictions
for specified op codes.

Bug: 15279535
Change-Id: I2381530ef6226a5bb32a99bb4030baafb39bf564
2014-07-02 09:02:46 -04:00
Adrian Roos
fa10423fa0 Add stable insets for stable system windows
Adds a new kind of inset that only accounts for stable system
windows like the system or navigation bar.

Bug: 15457292
Change-Id: I681b711f6f40a94c25b7acd3a44eb3539486afab
2014-07-02 12:34:05 +00:00
Ruben Brunk
4a61a86b36 camera2: Update camera metadata with legacy mode enum.
Bug: 15116722

- Adds enum for a device running in compatibility mode.  When running
  in compatibility mode, the Camera2 API is emulated using the
  deprecated Camera API, and many capabilities will not be supported.

Change-Id: I94f31775699447a82d53b7f2a6f9fbdc0a5afb3f
2014-07-01 23:59:23 +00:00