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

Commit 299dd5cc authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Android (Google) Code Review
Browse files

Merge "Update the glif theme usage in AvatarPickerActivity"

parents 7bb4eb9a 23d6f84a

packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java

+9 −1
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ import com.google.android.setupcompat.template.FooterBarMixin; 
import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupdesign.GlifLayout;

import com.google.android.setupdesign.GlifLayout;

import com.google.android.setupdesign.util.ThemeHelper;

import com.google.android.setupdesign.util.ThemeHelper;

import com.google.android.setupdesign.util.ThemeResolver;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;
@@ -81,7 +82,14 @@ public class AvatarPickerActivity extends Activity { 
    @Override

    @Override

    protected void onCreate(Bundle savedInstanceState) {

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);

        setTheme(R.style.SudThemeGlifV3_DayNight);

        boolean dayNightEnabled = ThemeHelper.isSetupWizardDayNightEnabled(this);

        ThemeResolver themeResolver =

                new ThemeResolver.Builder(ThemeResolver.getDefault())

                        .setDefaultTheme(ThemeHelper.getSuwDefaultTheme(this))

                        .setUseDayNight(true)

                        .build();

        int themeResId = themeResolver.resolve("", /* suppressDayNight= */ !dayNightEnabled);

        setTheme(themeResId);

        ThemeHelper.trySetDynamicColor(this);

        ThemeHelper.trySetDynamicColor(this);

        setContentView(R.layout.avatar_picker);

        setContentView(R.layout.avatar_picker);

        setUpButtons();

        setUpButtons();