Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 727186bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add remote control of Instant Apps" into nyc-mr1-dev

parents 6733fd04 6ed0c7e8

src/com/android/settings/applications/ManageDomainUrls.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Build; 
import android.os.Bundle;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.support.v14.preference.SwitchPreference;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;
@@ -57,9 +58,6 @@ import java.util.ArrayList; 
public class ManageDomainUrls extends SettingsPreferenceFragment

public class ManageDomainUrls extends SettingsPreferenceFragment

        implements ApplicationsState.Callbacks, OnPreferenceChangeListener {

        implements ApplicationsState.Callbacks, OnPreferenceChangeListener {





    // STOPSHIP; b/30256615

    private static final boolean DISABLE_WEB_ACTIONS = !Build.IS_DEBUGGABLE;



    private ApplicationsState mApplicationsState;

    private ApplicationsState mApplicationsState;

    private ApplicationsState.Session mSession;

    private ApplicationsState.Session mSession;

    private PreferenceGroup mDomainAppList;

    private PreferenceGroup mDomainAppList;
@@ -114,7 +112,9 @@ public class ManageDomainUrls extends SettingsPreferenceFragment 
            return;

            return;

        }

        }





        if (DISABLE_WEB_ACTIONS) {

        final boolean disableWebActions = Global.getInt(getContext().getContentResolver(),

                Global.ENABLE_EPHEMERAL_FEATURE, 1) == 0;

        if (disableWebActions) {

            mDomainAppList = getPreferenceScreen();

            mDomainAppList = getPreferenceScreen();

        } else {

        } else {

            final PreferenceGroup preferenceScreen = getPreferenceScreen();

            final PreferenceGroup preferenceScreen = getPreferenceScreen();