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

Commit 0e272e65 authored by Dan Sandler's avatar Dan Sandler Committed by android-build-merger
Browse files

One final tweak to the platlogo. am: 4b7e4158 am: 3fae8ae0 

am: 5643d0a5

Change-Id: Ic1ebdee84229863d6146fac0974ab31379165e6f
parents 8efcd566 5643d0a5

core/java/com/android/internal/app/PlatLogoActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.widget.ImageView; 


public class PlatLogoActivity extends Activity {

    public static final boolean REVEAL_THE_NAME = false;

    public static final boolean FINISH = false;



    FrameLayout mLayout;

    int mTapCount;
@@ -138,7 +139,7 @@ public class PlatLogoActivity extends Activity { 
                                } catch (ActivityNotFoundException ex) {

                                    Log.e("PlatLogoActivity", "No more eggs.");

                                }

                                finish();

                                if (FINISH) finish();

                            }

                        });

                        return true;

core/res/res/drawable-nodpi/platlogo.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ Copyright (C) 2016 The Android Open Source Project 
        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FF7E5BBF"

        android:fillColor="#FFc7d4b6"

        android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>

    <path

        android:fillColor="#FF7E5BBF"

        android:fillColor="#FFfbd3cb"

        android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>

    <path

        android:fillColor="#40000000"
@@ -31,7 +31,7 @@ Copyright (C) 2016 The Android Open Source Project 
        android:fillColor="#40000000"

        android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>

    <path

        android:fillColor="#FF55C4F5"

        android:fillColor="#FFe0e0d6"

        android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>

</vector>

packages/EasterEgg/res/drawable/icon.xml

+5 −6
Original line number Diff line number Diff line
@@ -14,15 +14,15 @@ Copyright (C) 2016 The Android Open Source Project 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="48dp"

        android:height="48dp"

        android:width="512dp"

        android:height="512dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#00796B"

        android:fillColor="#FF7E5BBF"

        android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>

    <path

        android:fillColor="#00796B"

        android:fillColor="#FF7E5BBF"

        android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>

    <path

        android:fillColor="#40000000"
@@ -31,8 +31,7 @@ Copyright (C) 2016 The Android Open Source Project 
        android:fillColor="#40000000"

        android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>

    <path

        android:fillColor="#4DB6AC"

        android:fillColor="#FF55C4F5"

        android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>

</vector>

packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java

+13 −2
Original line number Diff line number Diff line
@@ -18,8 +18,15 @@ import android.app.Activity; 
import android.content.ComponentName;

import android.content.pm.PackageManager;

import android.util.Log;

import android.widget.Toast;



public class NekoActivationActivity extends Activity {

    private void toastUp(String s) {

        Toast toast = Toast.makeText(this, s, Toast.LENGTH_SHORT);

        toast.getView().setBackgroundDrawable(null);

        toast.show();

    }



    @Override

    public void onStart() {

        super.onStart();
@@ -30,12 +37,16 @@ public class NekoActivationActivity extends Activity { 
            if (NekoLand.DEBUG) {

                Log.v("Neko", "Disabling tile.");

            }

            pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);

            pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                    PackageManager.DONT_KILL_APP);

            toastUp("\uD83D\uDEAB");

        } else {

            if (NekoLand.DEBUG) {

                Log.v("Neko", "Enabling tile.");

            }

            pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);

            pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,

                    PackageManager.DONT_KILL_APP);

            toastUp("\uD83D\uDC31");

        }

        finish();

    }