Remove intent filter of Output panel
-remove com.android.settings.panel.action.MEDIA_OUTPUT -remove com.android.settings.panel.action.MEDIA_OUTPUT_GROUP Bug: 170558292 Test: build pass Change-Id: Ifb4f0a492e9ed7a5848035577cbc044d010bf5dc
This commit is contained in:
@@ -3446,21 +3446,6 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity-alias
|
|
||||||
android:name="MediaOutputSlice"
|
|
||||||
android:label="@string/media_output_panel_title"
|
|
||||||
android:exported="true"
|
|
||||||
android:targetActivity=".panel.SettingsPanelActivity">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="com.android.settings.panel.action.MEDIA_OUTPUT" />
|
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
|
||||||
</intent-filter>
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="com.android.settings.panel.action.MEDIA_OUTPUT_GROUP" />
|
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
|
||||||
</intent-filter>
|
|
||||||
</activity-alias>
|
|
||||||
|
|
||||||
<provider android:name=".slices.SettingsSliceProvider"
|
<provider android:name=".slices.SettingsSliceProvider"
|
||||||
android:authorities="com.android.settings.slices;android.settings.slices"
|
android:authorities="com.android.settings.slices;android.settings.slices"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
|
@@ -18,9 +18,6 @@ package com.android.settings.panel;
|
|||||||
|
|
||||||
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
|
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
|
||||||
|
|
||||||
import static com.android.settings.panel.SettingsPanelActivity.KEY_MEDIA_PACKAGE_NAME;
|
|
||||||
import static com.android.settings.panel.SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT;
|
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
@@ -31,7 +28,6 @@ import static org.mockito.Mockito.spy;
|
|||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
@@ -82,35 +78,6 @@ public class SettingsPanelActivityTest {
|
|||||||
when(mSettingsPanelActivity.getSupportFragmentManager()).thenReturn(mFragmentManager);
|
when(mSettingsPanelActivity.getSupportFragmentManager()).thenReturn(mFragmentManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void startMediaOutputSlice_withPackageName_bundleShouldHaveValue() {
|
|
||||||
final Intent intent = new Intent()
|
|
||||||
.setAction("com.android.settings.panel.action.MEDIA_OUTPUT")
|
|
||||||
.putExtra("com.android.settings.panel.extra.PACKAGE_NAME",
|
|
||||||
"com.google.android.music");
|
|
||||||
|
|
||||||
final SettingsPanelActivity activity =
|
|
||||||
Robolectric.buildActivity(SettingsPanelActivity.class, intent).create().get();
|
|
||||||
|
|
||||||
assertThat(activity.mBundle.getString(KEY_MEDIA_PACKAGE_NAME))
|
|
||||||
.isEqualTo("com.google.android.music");
|
|
||||||
assertThat(activity.mBundle.getString(KEY_PANEL_TYPE_ARGUMENT))
|
|
||||||
.isEqualTo("com.android.settings.panel.action.MEDIA_OUTPUT");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void startMediaOutputSlice_withoutPackageName_bundleShouldHaveValue() {
|
|
||||||
final Intent intent = new Intent()
|
|
||||||
.setAction("com.android.settings.panel.action.MEDIA_OUTPUT");
|
|
||||||
|
|
||||||
final SettingsPanelActivity activity =
|
|
||||||
Robolectric.buildActivity(SettingsPanelActivity.class, intent).create().get();
|
|
||||||
|
|
||||||
assertThat(activity.mBundle.containsKey(KEY_MEDIA_PACKAGE_NAME)).isTrue();
|
|
||||||
assertThat(activity.mBundle.getString(KEY_PANEL_TYPE_ARGUMENT))
|
|
||||||
.isEqualTo("com.android.settings.panel.action.MEDIA_OUTPUT");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
|
public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
|
||||||
ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
|
ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", false);
|
||||||
|
Reference in New Issue
Block a user