Commit Graph

10634 Commits

Author SHA1 Message Date
George Mount
49c1a82f93 Merge "Fix saving target fragment when Fragment not yet created." into oc-dev am: a16859114d
am: 8695cbad31

Change-Id: I61a44a0cf781b6152cb10cc383f332ab9f540f10
2017-04-04 19:01:47 +00:00
George Mount
8695cbad31 Merge "Fix saving target fragment when Fragment not yet created." into oc-dev
am: a16859114d

Change-Id: Ia61f383eba7639a3c29fcf4a13b53177141e65d2
2017-04-04 18:55:21 +00:00
TreeHugger Robot
a16859114d Merge "Fix saving target fragment when Fragment not yet created." into oc-dev 2017-04-04 18:45:19 +00:00
Seigo Nonaka
c802751704 Merge "Reorganize font enumeration API." into oc-dev am: 2ac9698271
am: de5fa6b3d8

Change-Id: I72a02f3f681b3b5f82cffc317fe0668e842464fe
2017-04-04 17:04:40 +00:00
Seigo Nonaka
de5fa6b3d8 Merge "Reorganize font enumeration API." into oc-dev
am: 2ac9698271

Change-Id: Ie9bdcdb8d5997db421b783475e1058027cc4bb6f
2017-04-04 16:56:29 +00:00
TreeHugger Robot
2ac9698271 Merge "Reorganize font enumeration API." into oc-dev 2017-04-04 16:49:56 +00:00
Jorim Jaggi
cdfca9c3d2 Merge "Handle case when snapshot dimensions don't match" into oc-dev am: 1edadac465
am: 05ca99b43b

Change-Id: Ie5364d5617a159344d5232e48957ffd79a89a175
2017-04-04 09:32:02 +00:00
Jorim Jaggi
05ca99b43b Merge "Handle case when snapshot dimensions don't match" into oc-dev
am: 1edadac465

Change-Id: Icbe3f3c26cf65e7b12f5567a9bc40f7e0a3bd578
2017-04-04 09:23:35 +00:00
Jorim Jaggi
1edadac465 Merge "Handle case when snapshot dimensions don't match" into oc-dev 2017-04-04 09:14:38 +00:00
Adam Lesinski
bcc5b9f569 Merge "Themes: Apply themes to system_server safely" into oc-dev am: a52fc49845
am: b188c93a45

Change-Id: Idb98d85c8f98588bce7ca6480b5ac4a673050940
2017-04-04 03:41:14 +00:00
Adam Lesinski
b188c93a45 Merge "Themes: Apply themes to system_server safely" into oc-dev
am: a52fc49845

Change-Id: I85c390f99600d4f6cf75c9b3a4b1c39e7b874335
2017-04-04 03:33:42 +00:00
TreeHugger Robot
a52fc49845 Merge "Themes: Apply themes to system_server safely" into oc-dev 2017-04-04 03:25:29 +00:00
George Mount
5daf06c1e9 Fix saving target fragment when Fragment not yet created.
Bug 35928527

During optimized transactions, a fragment may be removed without
being created. That leaves the state of the fragment in INITIALIZING
and previously, that state wasn't ever saved. This CL allows a
fragment that is being removed to be brought up to the CREATED state
so that it can be saved during saveAllState().

Test: manual and Ie7207cc647312d38b377405bc5ec8721db757d2e

Change-Id: I649f1931745be43087ec3578e9195624e80821dc
2017-04-03 16:56:43 -07:00
Dianne Hackborn
859a452353 Merge "Framework support to improve bg check CTS tests." into oc-dev am: 78e8ac9c14
am: 13f9bb4c0a

Change-Id: I14c6dcd5f6328e700d1a6f5c059020767732bc6b
2017-04-03 22:37:12 +00:00
Dianne Hackborn
13f9bb4c0a Merge "Framework support to improve bg check CTS tests." into oc-dev
am: 78e8ac9c14

Change-Id: Ibc14492d2ce3cf312f7478a6f6edaf383d26f657
2017-04-03 22:32:11 +00:00
TreeHugger Robot
78e8ac9c14 Merge "Framework support to improve bg check CTS tests." into oc-dev 2017-04-03 22:26:01 +00:00
Seigo Nonaka
ff55115121 Reorganize font enumeration API.
This CL cleans up APIs around font variation settings.
- Remove FontConfig and FontManager public API.
- Remove FontManagerService from system service.
- Extract inner class FontConfig.Axis as top-level class FontVariationAxis.
  This is used by Typeface.Builder public API to create new Typeface.
- Introduce and expose FontVariationAxis utility functions from/to string.
- Throws if the invalid font variation settings is passed.

Test: android.text.cts.FontVariationAxisTest passes
Test: android.graphics.cts.TypefaceTest passes
Test: android.graphics.cts.PaintTest passes
Change-Id: I9ccafe7a53935960566243e2856e166878ca59ae
2017-04-03 13:55:07 -07:00
Makoto Onuki
82a67cad95 Merge "Persistent connection to DO/PO service." into oc-dev am: dcc792a13f
am: 24e1ad4001

Change-Id: Ia90400628ca9313f7ec2326a7c0967fe01e1cc6e
2017-04-03 20:49:51 +00:00
Makoto Onuki
24e1ad4001 Merge "Persistent connection to DO/PO service." into oc-dev
am: dcc792a13f

Change-Id: I05bb97b2708cab722e5dfa2807ac24f1869bb245
2017-04-03 20:44:25 +00:00
TreeHugger Robot
dcc792a13f Merge "Persistent connection to DO/PO service." into oc-dev 2017-04-03 20:35:18 +00:00
Jeff Davidson
9bcef123f4 Merge "Squashed merge of master-sim into master." 2017-04-03 20:26:59 +00:00
Winson Chung
79804e6b94 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev am: 34ecbaa991
am: 0ed0b685b4

Change-Id: I925a568a4bde9eaab06b227690094c6099b7dfff
2017-04-03 18:47:49 +00:00
Winson Chung
0ed0b685b4 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
am: 34ecbaa991

Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562
2017-04-03 18:36:26 +00:00
Chad Brubaker
d6ce1adabf Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c
am: a8c068f723

Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96
2017-04-03 18:25:36 +00:00
Winson Chung
34ecbaa991 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev 2017-04-03 18:23:31 +00:00
Jeff Davidson
35cda39422 Squashed merge of master-sim into master.
Includes the following commits:

==

New system feature: eUICC.

Presence of this feature implies that eUICC-related APIs are expected
to function as long as an eUICC is present in the device. Note that an
eUICC may be embedded in the device but may also be removable.

==

Add empty EuiccManager API and plumbing.

==

Add stub EuiccService.

EuiccService is the class that the LPA app must implement; for now,
just define the action and priority so that the implementation can be
found. Actual methods will come later.

Also declare two relevant permissions: BIND_EUICC_SERVICE, which the
implementation must require (so that nobody else can bind to the
service directly), and WRITE_EMBEDDED_SUBSCRIPTIONS, which permits
signature|privileged apps and CTS (via development) to access
EuiccManager APIs.

==

Add UiccAccessRule based off UiccCarrierPrivilegeRules#AccessRule.

This class can be used to transfer access rules between an
EuiccService implementation and the platform.

We also add a simple encoding/decoding of a list of rules so that they
may be stored in the subscription info table.

==

Add getEid() to EuiccManager/EuiccService.

getEid() fetches the EID. It requires either a privileged permission
(READ_PRIVILEGED_PHONE_STATE) or carrier privileges on the
currently-active profile. Until there is a use case that requires
opening this up to apps with only READ_PHONE_STATE, we shouldn't do
so.

To avoid churn in the future, the API signatures for EuiccService
include a slot ID to identify which SIM slot is being used. However,
this parameter is currently not populated correctly (nor is it usable,
as no Telephony APIs accept a slot ID to address commands). There is
no need to expose it yet in the EuiccManager APIs as we expect to
follow the TelephonyManager pattern of allowing per-slot instances of
EuiccManager in the future while keeping other method signatures the
same.

==

Define Euicc UI actions in EuiccManager/EuiccService.

The EuiccManager actions are to be implemented by the platform (and
only the platform), which forwards the actions to the active
implementation.

Also, remove our explicit priority meta-data tag as we can just rely
on android:priority in the corresponding intent-filter.

==

APIs for downloading embedded subscriptions.

Includes:

-getDownloadableSubscriptionMetadata, used by the platform and LUI to
fetch metadata about a downloadable subscription. The platform will
use this to perform the necessary permission checks (only allowing
otherwise-unprivileged apps to download profiles that are permitted
per the subscription metadata), and the LUI can use this to present
the name of the profile.

-downloadSubscription, to actually perform a profile download.

The stub for startResolutionActivity is included but not implemented;
resolution activities will be handled in a follow-up change.

==

Test: TreeHugger
Change-Id: I47b1da5a69f0736012cb137e02cd6c4e07fdaace
2017-04-03 11:17:53 -07:00
George Mount
c5045a323f Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev am: e9679db5e2
am: 834752d4b2

Change-Id: I8f60a0e8b45d6c9c0944b47d867cbb5727fafc7a
2017-04-03 18:13:28 +00:00
Chad Brubaker
a8c068f723 Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d
2017-04-03 18:13:27 +00:00
George Mount
834752d4b2 Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
am: e9679db5e2

Change-Id: I4192bc42bdc35ff29ac6e3c4ce2bb67f5a412c4b
2017-04-03 17:57:27 +00:00
Chad Brubaker
e35d50622c Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev 2017-04-03 17:34:13 +00:00
TreeHugger Robot
e9679db5e2 Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev 2017-04-03 16:34:17 +00:00
Jorim Jaggi
aea6b74e17 Handle case when snapshot dimensions don't match
If the snapshot starting window has different dimensions than the
snapshots we have taken, we do the following:

- Create a child Surface that has exactly the dimensions of the
snapshot.
- We fill the parent surface with the app background color, as well
as all screen background decorations (status bar background,
navigation bar background).
- We also clip of the status bar/navigation bar background in some
cases, as it looks ugly if it's not behind the system bars.
- Furthermore, we inherit all layout flags on the window and all
layout relevant SystemUI flags on the window such that it's very
likely that the size will match, and the system bars are drawn
correctly.
- In order to make the transition from the snapshot to the real
window a bit more predictable/less messy, we enforce a minimum
duration the snapshot is visible, which is slightly more than our
app transitions.

Test: TaskSnapshotSurfaceTest
Test: Open app, go home, go landscape, open app again
Test: Go to multi-window, open app from recents with a snapshot
taken in fullscreen.

Fixes: 36703868
Change-Id: Ia2d4add6971a18ab7aa2942d2b644d6e87a402af
2017-04-03 15:36:29 +02:00
TreeHugger Robot
5dbf82ed1f Merge "Correct unit in waitForMonitorWithTimeout JavaDoc." 2017-04-01 04:43:40 +00:00
Felipe Leme
09173fc216 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev am: 4d558930c8
am: 7de522c966

Change-Id: I938906a27bc95b7e200fe1f1211dd757641209f4
2017-04-01 02:48:10 +00:00
Felipe Leme
7de522c966 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev
am: 4d558930c8

Change-Id: I81b4396e998b375feca626e5c0bc188b5f85cb09
2017-04-01 02:39:50 +00:00
TreeHugger Robot
4d558930c8 Merge "Created an HtmlInfo object on ViewStructure." into oc-dev 2017-04-01 02:34:03 +00:00
Dianne Hackborn
9484603c0f Framework support to improve bg check CTS tests.
(Finally) introduce a new ServiceConnection callback to
tell you when the binding has died.  This allows you to robustly
have a weak service monitoring, and also is an easy way to find
out about breakages due to app updates etc.

Also clean up some debug output.

Test: moved to own suite and ran them.

Change-Id: I526cc00816c384fa9eb1312b92406f38085cbff9
2017-03-31 17:58:38 -07:00
Karthik Ravi Shankar
3b2b8a6753 Launch 2D activities in VR mode am: 99493dbc94
am: 9a26012d62

Change-Id: Id03fea3d32229761069f2bddfcadda60897c5637
2017-04-01 00:10:12 +00:00
Winson Chung
5af42fc305 Ensuring multi-window callbacks contain new configuration and are in order
- This CL has two main changes:
  1) It modifies the activity multi-window and picture-in-picture mode
     changed callbacks to provide the configuration of the activity with
     the mode applied.
  2) It modifies the order in which the multi-window and picture-in-picture
     mode callbacks are made, to ensure that when going in and out of
     picture-in-picture: first PiP, then MW, and then the config change.
- Previously, the ordering of the two callbacks was inconsistent.  When
  calling moveActivityToPinnedStack(), we reparent the task into the pinned
  stack (triggering the picture-in-picture mode change), followed by the
  resize animation (causes configuration changes).  Inversely, when we
  expand the task to fullscreen (and not just remove it), we run the
  animation first, which resizes the task to the final size (causes
  configuration changes) then reparent after the animation completes
  (triggering the picture-in-picture mode change).

  In this CL, we ensure that for both the transition in and out of PiP, we
  defer to the bounds animation to trigger the PiP mode change.  Normal
  calls to reparent or adding a new task are unchanged.  When the PiP
  mode change is called from the animation, it provides the final target
  bounds which we use to calculate the target configuration of the activity
  for the callback.  If the bounds animation is interrupted, an update will
  also be scheduled if we change the fullscreen state we are animating to.

  To work around the issue where we are scheduling MW/PiP mode changes in
  both the animation and the configuration change, we also now keep track
  of each state internally in the ActivityRecord.

Bug: 36099777
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testConfigurationChangeOrderDuringTransition

Change-Id: I03513bc3a4d4a72c250983f22f079ce9d7a2cb40
Signed-off-by: Winson Chung <winsonc@google.com>
2017-03-31 17:04:26 -07:00
Karthik Ravi Shankar
9a26012d62 Launch 2D activities in VR mode
am: 99493dbc94

Change-Id: I33c4458ca441b8e95d45516cce2bcb7eb020ee3f
2017-03-31 23:59:22 +00:00
TreeHugger Robot
f04d039584 Merge changes from topic 'launch-2d-activities-vr' into oc-dev
* changes:
  Allow shell uid to access Vr APIs
  Add vr persistent mode enable/disable
  Launch 2D activities in VR mode
2017-03-31 23:48:22 +00:00
Dianne Hackborn
cc88ddd7ea Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev am: 2d161b1d3f
am: 666fe849e3

Change-Id: I61afc96a01bc8bc5d637d65a3f9a84452babd3ed
2017-03-31 23:44:42 +00:00
Dianne Hackborn
666fe849e3 Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev
am: 2d161b1d3f

Change-Id: I4aed07a3ad88f3b171e92aaa70f88bcc4da131b8
2017-03-31 23:29:01 +00:00
TreeHugger Robot
2d161b1d3f Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev 2017-03-31 23:21:11 +00:00
Makoto Onuki
fc73d799e9 Persistent connection to DO/PO service.
Test: Manual test with customize API tests; CTS coming.
Change-Id: I1d7eaa4b1fdd20726c1832c736d32f934c6a82f9
2017-03-31 14:50:20 -07:00
Chad Brubaker
0c1651f289 Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS
Bug: 35853790
Test: make -j128 checkbuild
Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases
Change-Id: I11d374cbbb6c2deaf74ac784ff995bd182fe9157
2017-03-31 11:20:02 -07:00
Dianne Hackborn
a47223f99b Implement issue #36590595: Add ability to associated a ClipData with JobInfo
Yum!

Also needed to have a Context.revokeUriPermission() variant that is sane,
so reasonable CTS tests can be written.

Test: new ClipDataJobTest added.

Change-Id: Ia3135ea788a6e32c971bae7dab3a844d0ef4139c
2017-03-31 10:41:50 -07:00
Julia Reynolds
8e6cb82a1a Merge "Rename badge icon method" into oc-dev am: ed8d07f213
am: 52e063ee15

Change-Id: If360b1c8a5f84c0be519cc8ce7e472c23608c202
2017-03-31 16:51:51 +00:00
Julia Reynolds
52e063ee15 Merge "Rename badge icon method" into oc-dev
am: ed8d07f213

Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a
2017-03-31 16:41:27 +00:00
Julia Reynolds
ed8d07f213 Merge "Rename badge icon method" into oc-dev 2017-03-31 16:34:03 +00:00