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

Commit d0c1f6eb authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "Let activity of "add language" fit settingsactivity style." into sc-v2-dev am: 50726121

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220935

Change-Id: Ie39a2fc21627305052910669cdacbd16ff329ece
parents 0f6c95d4 50726121
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package com.android.settings.localepicker;

import android.app.Activity;
import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
@@ -24,8 +23,11 @@ import android.view.MenuItem;

import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore;
import com.android.settings.R;
import com.android.settings.core.SettingsBaseActivity;

public class LocalePickerWithRegionActivity extends Activity
/** A activity to show the locale picker page. */
public class LocalePickerWithRegionActivity extends SettingsBaseActivity
        implements LocalePickerWithRegion.LocaleSelectedListener {

    private static final String PARENT_FRAGMENT_NAME = "localeListEditor";
@@ -40,7 +42,7 @@ public class LocalePickerWithRegionActivity extends Activity
        getFragmentManager()
                .beginTransaction()
                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                .replace(android.R.id.content, selector)
                .replace(R.id.content_frame, selector)
                .addToBackStack(PARENT_FRAGMENT_NAME)
                .commit();
    }