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

Commit 6381f69b authored by Rico Wind's avatar Rico Wind Committed by Automerger Merge Worker
Browse files

Merge "Don't assume R class fields are constants" into main am: daefc888 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3206584



Change-Id: I779346314cd03a468e1d9f64e564e90649676e3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a536d39 daefc888

packages/EasterEgg/src/com/android/egg/paint/PaintActivity.java

+22 −28
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.view.MotionEvent.ACTION_UP; 


import android.app.Activity;

import android.content.res.Configuration;

import android.graphics.Bitmap;

import android.graphics.Color;

import android.os.Bundle;

import android.view.MotionEvent;
@@ -38,9 +37,7 @@ import android.widget.Magnifier; 


import com.android.egg.R;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.stream.IntStream;



public class PaintActivity extends Activity {
@@ -60,31 +57,28 @@ public class PaintActivity extends Activity { 
    private View.OnClickListener buttonHandler = new View.OnClickListener() {

        @Override

        public void onClick(View view) {

            switch (view.getId()) {

                case R.id.btnBrush:

            // With non final fields in the R class we can't switch on the

            // id since the case values are no longer constants.

            int viewId = view.getId();

            if (viewId == R.id.btnBrush) {

                view.setSelected(true);

                hideToolbar(colors);

                toggleToolbar(brushes);

                    break;

                case R.id.btnColor:

            } else if (viewId == R.id.btnColor) {

                view.setSelected(true);

                hideToolbar(brushes);

                toggleToolbar(colors);

                    break;

                case R.id.btnClear:

            } else if (viewId == R.id.btnClear) {

                painting.clear();

                    break;

                case R.id.btnSample:

            } else if (viewId == R.id.btnSample) {

                sampling = true;

                view.setSelected(true);

                    break;

                case R.id.btnZen:

            } else if (viewId == R.id.btnZen) {

                painting.setZenMode(!painting.getZenMode());

                view.animate()

                        .setStartDelay(200)

                        .setInterpolator(new OvershootInterpolator())

                        .rotation(painting.getZenMode() ? 0f : 90f);

                    break;

            }

        }

    };