Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev
This commit is contained in:
@@ -1117,7 +1117,15 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name=".notification.RedactionInterstitial" />
|
<activity android:name=".notification.RedactionInterstitial"/>
|
||||||
|
|
||||||
|
<activity android:name=".notification.RedactionSettingsStandalone"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.settings.ACTION_APP_NOTIFICATION_REDACTION" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
<activity android:name="ConfirmLockPattern"/>
|
<activity android:name="ConfirmLockPattern"/>
|
||||||
|
|
||||||
|
@@ -0,0 +1,43 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2014 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.notification;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import com.android.settings.SettingsActivity;
|
||||||
|
import com.android.settings.notification.RedactionInterstitial.RedactionInterstitialFragment;
|
||||||
|
|
||||||
|
/** Wrapper to allow external activites to jump directly to the {@link RedactionInterstitial} */
|
||||||
|
public class RedactionSettingsStandalone extends SettingsActivity {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Intent getIntent() {
|
||||||
|
Intent modIntent = new Intent(super.getIntent());
|
||||||
|
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, RedactionInterstitialFragment.class.getName())
|
||||||
|
.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true)
|
||||||
|
.putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null)
|
||||||
|
.putExtra(EXTRA_PREFS_SET_NEXT_TEXT, getString(
|
||||||
|
R.string.app_notifications_dialog_done));
|
||||||
|
return modIntent;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean isValidFragment(String fragmentName) {
|
||||||
|
return RedactionInterstitialFragment.class.getName().equals(fragmentName);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user