Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable Sharesheet direct share target append prototype for droidfood." into rvc-dev am: 66726b1e19 am: 093339997a

Browse Source 
Change-Id: I099f432def692e4411d8d2cb5aab98768fdea543
This commit is contained in:
Song Hu
2020-04-03 15:17:22 +00:00
committed by Automerger Merge Worker
parent b4549abf5b 093339997a
commit 327a41e69c
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -235,7 +235,7 @@ public class ChooserActivity extends ResolverActivity implements
private boolean mAppendDirectShareEnabled = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.APPEND_DIRECT_SHARE_ENABLED,
false);
true);
private Bundle mReplacementExtras;
private IntentSender mChosenComponentSender;

2
core/java/com/android/internal/app/ChooserListAdapter.java
View File

@@ -64,7 +64,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
private boolean mAppendDirectShareEnabled = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.APPEND_DIRECT_SHARE_ENABLED,
false);
true);
private boolean mEnableStackedApps = true;

12
core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java
View File

@@ -67,6 +67,7 @@ import android.graphics.drawable.Icon;
import android.metrics.LogMaker;
import android.net.Uri;
import android.os.UserHandle;
import android.provider.DeviceConfig;
import android.service.chooser.ChooserTarget;
import androidx.test.platform.app.InstrumentationRegistry;
@@ -75,6 +76,7 @@ import androidx.test.rule.ActivityTestRule;
import com.android.internal.R;
import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;
import com.android.internal.app.chooser.DisplayResolveInfo;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.FrameworkStatsLog;
@@ -141,6 +143,10 @@ public class ChooserActivityTest {
public void cleanOverrideData() {
sOverrides.reset();
sOverrides.createPackageManager = mPackageManagerOverride;
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
SystemUiDeviceConfigFlags.APPEND_DIRECT_SHARE_ENABLED,
Boolean.toString(false),
true /* makeDefault*/);
}
@Test
@@ -989,7 +995,7 @@ public class ChooserActivityTest {
serviceTargets,
TARGET_TYPE_CHOOSER_TARGET,
directShareToShortcutInfos,
null)
List.of())
);
// Thread.sleep shouldn't be a thing in an integration test but it's
@@ -1061,7 +1067,7 @@ public class ChooserActivityTest {
serviceTargets,
TARGET_TYPE_CHOOSER_TARGET,
directShareToShortcutInfos,
null)
List.of())
);
// Thread.sleep shouldn't be a thing in an integration test but it's
// necessary here because of the way the code is structured
@@ -1149,7 +1155,7 @@ public class ChooserActivityTest {
serviceTargets,
TARGET_TYPE_CHOOSER_TARGET,
directShareToShortcutInfos,
null)
List.of())
);
// Thread.sleep shouldn't be a thing in an integration test but it's
// necessary here because of the way the code is structured