Merge "ANDROID 14 -- SPACE PROGRAM -- LAUNCH IMMINENT" into udc-dev (358673c0) · Commits · e / os / android_frameworks_base

packages/EasterEgg/Android.bp

+28 −8

Original line number	Diff line number	Diff line
		@@ -26,7 +26,10 @@ package {
		android_app {
		// the build system in pi-dev can't quite handle R.java in kt
		// so we will have a mix of java and kotlin files
		srcs: ["src/*/.java", "src/*/.kt"],
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		],

		resource_dirs: ["res"],

		@@ -36,16 +39,33 @@ android_app {
		certificate: "platform",

		optimize: {
		enabled: true,
		optimize: true,
		shrink: true,
		shrink_resources: true,
		proguard_compatibility: false,
		proguard_flags_files: ["proguard.flags"],
		},

		static_libs: [
		"androidx.core_core",
		"androidx.recyclerview_recyclerview",
		"androidx.annotation_annotation",
		"androidx.recyclerview_recyclerview",
		"kotlinx-coroutines-android",
		"kotlinx-coroutines-core",
		//"kotlinx-coroutines-reactive",

		"androidx.core_core-ktx",
		"androidx.lifecycle_lifecycle-runtime-ktx",
		"androidx.activity_activity-compose",
		"androidx.compose.ui_ui",
		"androidx.compose.ui_ui-util",
		"androidx.compose.ui_ui-tooling-preview",
		"androidx.compose.material_material",
		"androidx.window_window",

		"androidx.compose.runtime_runtime",
		"androidx.activity_activity-compose",
		"androidx.compose.ui_ui",
		],

		manifest: "AndroidManifest.xml",

packages/EasterEgg/AndroidManifest.xml

+37 −4

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<?xml version="1.0" encoding="utf-8"?><!--
		Copyright (C) 2023 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.egg"
		android:versionCode="12"
		@@ -18,8 +33,27 @@
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

		<application
		android:icon="@drawable/icon"
		android:icon="@drawable/android14_patch_adaptive"
		android:label="@string/app_name">

		<!-- Android U easter egg -->

		<activity
		android:name=".landroid.MainActivity"
		android:exported="true"
		android:label="@string/u_egg_name"
		android:icon="@drawable/android14_patch_adaptive"
		android:configChanges="orientation\|screenLayout\|screenSize\|density"
		android:theme="@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen">
		<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>
		</activity>


		<!-- Android Q easter egg -->
		<activity
		android:name=".quares.QuaresActivity"
		android:exported="true"
		@@ -69,7 +103,7 @@
		android:exported="true"
		android:showOnLockScreen="true"
		android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar" />
		<!-- Used to enable easter egg -->
		<!-- Used to enable easter egg components for earlier easter eggs. -->
		<activity
		android:name=".ComponentActivationActivity"
		android:excludeFromRecents="true"
		@@ -79,7 +113,6 @@
		<action android:name="android.intent.action.MAIN" />

		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="com.android.internal.category.PLATLOGO" />
		</intent-filter>
		</activity>

packages/EasterEgg/res/drawable/android14_patch_adaptive.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
		<background android:drawable="@drawable/android14_patch_adaptive_background"/>
		<foreground android:drawable="@drawable/android14_patch_adaptive_foreground"/>
		<monochrome android:drawable="@drawable/android14_patch_monochrome"/>
		</adaptive-icon>
		No newline at end of file

packages/EasterEgg/res/drawable/android14_patch_adaptive_background.xml

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="108dp"
		android:height="108dp"
		android:viewportWidth="108"
		android:viewportHeight="108">
		<path
		android:pathData="M0,0 L108,0 L108,108 L0,108 z"
		android:fillColor="#FF073042"/>
		<path
		android:pathData="M44.51,43.32L44.86,42.27C47.04,54.48 52.81,86.71 52.81,50.14C52.81,49.99 52.92,49.86 53.06,49.86H55.04C55.18,49.86 55.3,49.98 55.3,50.14C55.27,114.18 44.51,43.32 44.51,43.32Z"
		android:fillColor="#3DDC84"/>
		<path
		android:name="planetary head"
		android:pathData="M38.81,42.23L33.63,51.21C33.33,51.72 33.51,52.38 34.02,52.68C34.54,52.98 35.2,52.8 35.49,52.28L40.74,43.2C49.22,47 58.92,47 67.4,43.2L72.65,52.28C72.96,52.79 73.62,52.96 74.13,52.65C74.62,52.35 74.79,51.71 74.51,51.21L69.33,42.23C78.23,37.39 84.32,28.38 85.21,17.74H22.93C23.82,28.38 29.91,37.39 38.81,42.23Z"
		android:fillColor="#ffffff"/>
		<!-- yes it's an easter egg in a vector drawable -->
		<path
		android:name="planetary body"
		android:pathData="M22.9,0 L85.1,0 L85.1,15.5 L22.9,15.5 z"
		android:fillColor="#ffffff" />
		<path
		android:pathData="M54.96,43.32H53.1C52.92,43.32 52.77,43.47 52.77,43.65V48.04C52.77,48.22 52.92,48.37 53.1,48.37H54.96C55.15,48.37 55.3,48.22 55.3,48.04V43.65C55.3,43.47 55.15,43.32 54.96,43.32Z"
		android:fillColor="#3DDC84"/>
		<path
		android:pathData="M54.99,40.61H53.08C52.91,40.61 52.77,40.75 52.77,40.92V41.56C52.77,41.73 52.91,41.87 53.08,41.87H54.99C55.16,41.87 55.3,41.73 55.3,41.56V40.92C55.3,40.75 55.16,40.61 54.99,40.61Z"
		android:fillColor="#3DDC84"/>
		<path
		android:pathData="M41.49,47.88H40.86V48.51H41.49V47.88Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M44.13,57.08H43.5V57.71H44.13V57.08Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M72.29,66.76H71.66V67.39H72.29V66.76Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M59.31,53.41H58.68V54.04H59.31V53.41Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M64.47,48.19H63.84V48.83H64.47V48.19Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M60.58,59.09H59.95V59.72H60.58V59.09Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M66.95,56.7H65.69V57.97H66.95V56.7Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M44.13,60.71H43.5V61.34H44.13V60.71Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M49.66,51.33H48.4V52.6H49.66V51.33Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M57.78,63.83H56.52V65.09H57.78V63.83Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M61.1,68.57H59.83V69.83H61.1V68.57Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M40.43,53.73H39.16V54.99H40.43V53.73Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M74.47,44H73.21V45.26H74.47V44Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M36.8,64.58H35.54V65.84H36.8V64.58Z"
		android:fillColor="#ffffff"/>
		</vector>

packages/EasterEgg/res/drawable/android14_patch_adaptive_foreground.xml

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="108dp"
		android:height="108dp"
		android:viewportWidth="108"
		android:viewportHeight="108">
		<path
		android:pathData="M54.03,33.03C52.99,33.03 52.14,33.86 52.14,34.87V37.14C52.14,37.34 52.3,37.5 52.5,37.5C52.69,37.5 52.85,37.34 52.85,37.14V36.53C52.85,36.14 53.17,35.82 53.56,35.82H54.51C54.9,35.82 55.22,36.14 55.22,36.53V37.14C55.22,37.34 55.38,37.5 55.57,37.5C55.77,37.5 55.93,37.34 55.93,37.14V34.87C55.93,33.86 55.08,33.03 54.03,33.03H54.03Z"
		android:fillColor="#3DDC84"/>
		<path
		android:pathData="M108,0H0V108H108V0ZM54,80.67C68.73,80.67 80.67,68.73 80.67,54C80.67,39.27 68.73,27.33 54,27.33C39.27,27.33 27.33,39.27 27.33,54C27.33,68.73 39.27,80.67 54,80.67Z"
		android:fillColor="#F86734"
		android:fillType="evenOdd"/>
		<group>
		<!-- the text doesn't look great everywhere but you can remove the clip to try it out. -->
		<clip-path />
		<path
		android:pathData="M28.58,32.18L29.18,31.5L33.82,33.02L33.12,33.81L32.15,33.48L30.92,34.87L31.37,35.8L30.68,36.58L28.58,32.18L28.58,32.18ZM31.25,33.18L29.87,32.71L30.51,34.02L31.25,33.18V33.18Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M38,29.76L34.61,28.79L36.23,31.04L35.42,31.62L32.8,27.99L33.5,27.48L36.88,28.45L35.26,26.21L36.08,25.62L38.7,29.25L38,29.76Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M39.23,23.87L40.63,23.27C41.79,22.77 43.13,23.28 43.62,24.43C44.11,25.57 43.56,26.89 42.4,27.39L40.99,27.99L39.23,23.87ZM42.03,26.54C42.73,26.24 42.96,25.49 42.68,24.83C42.4,24.17 41.69,23.82 41,24.11L40.51,24.32L41.55,26.75L42.03,26.54Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M45.91,21.43L47.64,21.09C48.47,20.93 49.12,21.41 49.27,22.15C49.38,22.72 49.15,23.14 48.63,23.45L50.57,25.08L49.39,25.31L47.57,23.79L47.41,23.82L47.76,25.63L46.78,25.83L45.91,21.43H45.91ZM47.87,22.86C48.16,22.8 48.34,22.59 48.29,22.34C48.24,22.07 48,21.96 47.71,22.02L47.07,22.14L47.24,22.98L47.87,22.86Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M52.17,22.69C52.19,21.41 53.24,20.39 54.52,20.41C55.8,20.43 56.82,21.49 56.8,22.76C56.78,24.04 55.72,25.06 54.45,25.04C53.17,25.02 52.15,23.96 52.17,22.69ZM55.79,22.75C55.8,22.02 55.23,21.39 54.51,21.38C53.78,21.37 53.19,21.98 53.18,22.7C53.17,23.43 53.73,24.06 54.47,24.07C55.19,24.08 55.78,23.47 55.79,22.75H55.79Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M60,21.01L60.98,21.2L60.12,25.6L59.14,25.41L60,21.01Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M64.3,22.03L65.73,22.58C66.91,23.03 67.51,24.32 67.07,25.49C66.62,26.65 65.31,27.22 64.13,26.77L62.71,26.22L64.3,22.03L64.3,22.03ZM64.46,25.9C65.17,26.17 65.86,25.8 66.12,25.12C66.37,24.45 66.11,23.71 65.4,23.44L64.91,23.25L63.97,25.72L64.46,25.9Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M73.59,27.94L72.94,27.44L73.51,26.69L74.92,27.77L72.2,31.34L71.45,30.76L73.59,27.94Z"
		android:fillColor="#ffffff"/>
		<path
		android:pathData="M76.18,33.75L74.69,32.14L75.25,31.62L78.81,31.42L79.4,32.05L77.47,33.85L77.86,34.27L77.22,34.86L76.83,34.44L76.12,35.11L75.47,34.41L76.18,33.75ZM77.72,32.31L76.12,32.4L76.82,33.15L77.72,32.31Z"
		android:fillColor="#ffffff"/>
		</group>
		</vector>