Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One final tweak to the platlogo. am: 4b7e415803

Browse Source 
am: 3fae8ae0c6

Change-Id: Icf198e2c7d34703a4cd8856bc08f31925a20b622
This commit is contained in:
Dan Sandler
2016-06-28 07:14:54 +00:00
committed by android-build-merger
parent ca3a67d156 3fae8ae0c6
commit 5643d0a5f8
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/PlatLogoActivity.java
View File

@@ -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;

6
core/res/res/drawable-nodpi/platlogo.xml
View File

@@ -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>

11
packages/EasterEgg/res/drawable/icon.xml
View File

@@ -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>

15
packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java
View File

@@ -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();
}