Merge "Add an action name and support 2-pane UI in Backup page" into main

                  android:label="@string/privacy_settings_title"

                  android:exported="true"

                  android:icon="@drawable/ic_settings_backup">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.BACKUP_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

import android.util.Log;

import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentManager;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.search.Indexable;

import com.android.settingslib.search.SearchIndexable;

 * Therefore, as a simple workaround, we use a new class which is enabled by default.

 */

@SearchIndexable

public class UserBackupSettingsActivity extends FragmentActivity implements Indexable {

public class UserBackupSettingsActivity extends SettingsActivity implements Indexable {

    private static final String TAG = "BackupSettingsActivity";

    private FragmentManager mFragmentManager;

    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (isFinishing()) {

            return;

        }

        BackupSettingsHelper backupHelper = new BackupSettingsHelper(this);