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

Commit 2f9eb374 authored by Daniel Sandler's avatar Daniel Sandler Committed by Automerger Merge Worker
Browse files

Merge changes from topic "egg-finally" into sc-dev am: a380ffbf 

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

Change-Id: Ib44ef0b0a8ee383c8c9eff35f8e8804247da01cc
parents 84535904 a380ffbf

packages/EasterEgg/AndroidManifest.xml

+66 −35
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    package="com.android.egg"

    android:versionCode="1"

    android:versionCode="12"

    android:versionName="1.0">



    <uses-permission android:name="android.permission.WRITE_SETTINGS" />



    <!-- used for cat notifications -->

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />



    <!-- used to save cat images -->

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />



    <!-- controls -->

    <uses-permission android:name="android.permission.BIND_CONTROLS" />



    <application

        android:icon="@drawable/icon"

        android:label="@string/app_name">



        <activity android:name=".quares.QuaresActivity"

        <activity

            android:name=".quares.QuaresActivity"

            android:exported="true"

            android:icon="@drawable/q_icon"

            android:label="@string/q_egg_name"

            android:exported="true"

            android:theme="@style/QuaresTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -29,9 +31,9 @@ 
        <activity

            android:name=".paint.PaintActivity"

            android:configChanges="orientation|keyboardHidden|screenSize|uiMode"

            android:exported="true"

            android:icon="@drawable/p_icon"

            android:label="@string/p_egg_name"

            android:exported="true"

            android:theme="@style/AppTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -39,13 +41,15 @@ 
        </activity>



        <!-- Android N easter egg bits -->

        <activity android:name=".neko.NekoLand"

            android:theme="@android:style/Theme.Material.NoActionBar"

        <activity

            android:name=".neko.NekoLand"

            android:exported="true"

            android:label="@string/app_name">

            android:label="@string/app_name"

            android:theme="@android:style/Theme.Material.NoActionBar">

            <intent-filter>

                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />

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



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

            </intent-filter>

        </activity>
@@ -54,25 +58,24 @@ 
        <service

            android:name=".neko.NekoService"

            android:enabled="true"

            android:permission="android.permission.BIND_JOB_SERVICE"

            android:exported="true" >

        </service>



            android:exported="true"

            android:permission="android.permission.BIND_JOB_SERVICE" />

        <!-- Used to show over lock screen -->

        <activity android:name=".neko.NekoLockedActivity"

        <activity

            android:name=".neko.NekoLockedActivity"

            android:excludeFromRecents="true"

            android:exported="true"

            android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"

            android:showOnLockScreen="true" />



            android:showOnLockScreen="true"

            android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar" />

        <!-- Used to enable easter egg -->

        <activity android:name=".neko.NekoActivationActivity"

        <activity

            android:name=".ComponentActivationActivity"

            android:excludeFromRecents="true"

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay"

            >

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

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



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

                <category android:name="com.android.internal.category.PLATLOGO" />

            </intent-filter>
@@ -81,37 +84,65 @@ 
        <!-- The quick settings tile, disabled by default -->

        <service

            android:name=".neko.NekoTile"

            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"

            android:icon="@drawable/stat_icon"

            android:enabled="false"

            android:exported="true"

            android:label="@string/default_tile_name">

            android:icon="@drawable/stat_icon"

            android:label="@string/default_tile_name"

            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">

            <intent-filter>

                <action android:name="android.service.quicksettings.action.QS_TILE" />

            </intent-filter>

        </service>



        <service android:name=".neko.NekoControlsService"

            android:permission="android.permission.BIND_CONTROLS"

            android:label="@string/r_egg_name"

            android:icon="@drawable/ic_fullcat_icon"

        <service

            android:name=".neko.NekoControlsService"

            android:enabled="false"

            android:exported="true">

            android:exported="true"

            android:icon="@drawable/ic_fullcat_icon"

            android:label="@string/r_egg_name"

            android:permission="android.permission.BIND_CONTROLS">

            <intent-filter>

                <action android:name="android.service.controls.ControlsProviderService" />

            </intent-filter>

        </service>



        <!-- FileProvider for sending pictures -->

        </service> <!-- FileProvider for sending pictures -->

        <provider

            android:name="androidx.core.content.FileProvider"

            android:authorities="com.android.egg.fileprovider"

            android:grantUriPermissions="true"

            android:exported="false">

            android:exported="false"

            android:grantUriPermissions="true">

            <meta-data

                android:name="android.support.FILE_PROVIDER_PATHS"

                android:resource="@xml/filepaths" />

        </provider>



        <!-- Android S easter egg bits -->



        <!-- List of all system theme colors on the device. -->

        <activity

            android:name=".widget.PaintChipsActivity"

            android:theme="@android:style/Theme.Material.Wallpaper.NoTitleBar"

            android:configChanges="orientation|keyboardHidden|screenSize|uiMode"

            android:label="@string/s_egg_name"

            android:enabled="false"

            android:exported="true">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <!-- Homescreen widget also showing paint chips (may be affected by the exact position in

             the workspace) -->

        <receiver

            android:name=".widget.PaintChipsWidget"

            android:label="@string/s_egg_name"

            android:enabled="false">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>



            <meta-data

                android:name="android.appwidget.provider"

                android:resource="@xml/paint_chips_widget_info" />

        </receiver>

    </application>



</manifest>
 
 No newline at end of file

packages/EasterEgg/build.gradle

+6 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:4.0.0'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath 'com.android.tools.build:gradle:7.0.0-alpha08'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"

    }

}
@@ -62,6 +62,9 @@ android { 
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

        }

    }

    buildFeatures {

        viewBinding true

    }





}
@@ -74,6 +77,7 @@ dependencies { 
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'

    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"

    implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"

    implementation 'com.google.android.material:material:1.3.0'

    testImplementation 'junit:junit:4.12'

    androidTestImplementation 'androidx.test.ext:junit:1.1.1'

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

packages/EasterEgg/gradle.properties

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ android.enableJetifier=true 
kotlin.code.style=official



ANDROID_X_VERSION=1+

COMPILE_SDK=android-30

COMPILE_SDK=android-S

BUILD_TOOLS_VERSION=28.0.3

packages/EasterEgg/res/drawable/android_s.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<vector android:height="108dp" android:viewportHeight="48"

    android:viewportWidth="48" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <group>

        <clip-path android:pathData="M17,14h14v20h-14z"/>

        <path android:fillColor="#00000000"

            android:pathData="M18,21C18,21.7956 18.3161,22.5587 18.8787,23.1213C19.4413,23.6839 20.2044,24 21,24H27C27.7956,24 28.5587,24.3161 29.1213,24.8787C29.6839,25.4413 30,26.2044 30,27"

            android:strokeColor="#ffffff" android:strokeWidth="2"/>

        <path android:fillColor="#ffffff" android:pathData="M22,21C22.5523,21 23,20.5523 23,20C23,19.4477 22.5523,19 22,19C21.4477,19 21,19.4477 21,20C21,20.5523 21.4477,21 22,21Z"/>

        <path android:fillColor="#ffffff" android:pathData="M26,21C26.5523,21 27,20.5523 27,20C27,19.4477 26.5523,19 26,19C25.4477,19 25,19.4477 25,20C25,20.5523 25.4477,21 26,21Z"/>

        <path android:fillColor="#00000000"

            android:pathData="M19.5,16.5L18,15"

            android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/>

        <path android:fillColor="#00000000"

            android:pathData="M28.5,16.5L30,15"

            android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/>

        <path android:fillColor="#00000000"

            android:pathData="M29.92,20C29.8637,19.6605 29.7801,19.3261 29.67,19C29.205,17.6561 28.2777,16.5211 27.0536,15.7973C25.8294,15.0735 24.388,14.8081 22.9864,15.0483C21.5847,15.2885 20.314,16.0188 19.4007,17.1088C18.4874,18.1989 17.991,19.5779 18,21"

            android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/>

        <path android:fillColor="#00000000"

            android:pathData="M18.08,28C18.1363,28.3395 18.2199,28.6739 18.33,29C18.795,30.3439 19.7223,31.4789 20.9464,32.2027C22.1705,32.9265 23.612,33.1919 25.0136,32.9517C26.4153,32.7115 27.686,31.9812 28.5993,30.8912C29.5126,29.8011 30.009,28.4221 30,27"

            android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/>

    </group>

</vector>

packages/EasterEgg/res/drawable/icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ Copyright (C) 2018 The Android Open Source Project 
-->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@drawable/icon_bg"/>

    <foreground android:drawable="@drawable/android_11_dial"/>

    <foreground android:drawable="@drawable/android_s"/>

</adaptive-icon>