summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDanesh Mondegarian <daneshm90@gmail.com>2012-12-09 16:50:20 -0500
committerDanesh Mondegarian <daneshm90@gmail.com>2012-12-09 22:52:04 -0500
commit0561b72b08e2f24a93d6c34c3dd5c20f22c3ef77 (patch)
treef82f27377abbb923eb10c03d9f4df98833571b72 /core
parent7536aa5014aa2ff2433896c22c0009ca2990fcde (diff)
downloadframeworks_base-0561b72b08e2f24a93d6c34c3dd5c20f22c3ef77.zip
frameworks_base-0561b72b08e2f24a93d6c34c3dd5c20f22c3ef77.tar.gz
frameworks_base-0561b72b08e2f24a93d6c34c3dd5c20f22c3ef77.tar.bz2
CidBean : Changes to toggle between CID and Jellybean
Based on Robert Burns commit from 10.0 Patchset 2 : Remove unused imports Patchset 3 : Format cleanup Change-Id: I2827425681463d4ca077607cb6a043c28bf6f633
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/app/PlatLogoActivity.java9
-rw-r--r--core/res/res/drawable-nodpi/cidlogo.pngbin0 -> 34391 bytes
-rw-r--r--core/res/res/drawable-nodpi/cidlogo_alt.pngbin0 -> 35091 bytes
-rw-r--r--core/res/res/values/symbols.xml2
4 files changed, 8 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java
index 3a2b647..bac8e21 100644
--- a/core/java/com/android/internal/app/PlatLogoActivity.java
+++ b/core/java/com/android/internal/app/PlatLogoActivity.java
@@ -84,7 +84,7 @@ public class PlatLogoActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+ final boolean isCid = getIntent().hasExtra("is_cid");
mToast = Toast.makeText(this, "", Toast.LENGTH_LONG);
mToast.setView(makeView());
@@ -92,7 +92,8 @@ public class PlatLogoActivity extends Activity {
getWindowManager().getDefaultDisplay().getMetrics(metrics);
mContent = new ImageView(this);
- mContent.setImageResource(com.android.internal.R.drawable.platlogo_alt);
+ mContent.setImageResource(isCid ? com.android.internal.R.drawable.cidlogo
+ : com.android.internal.R.drawable.platlogo_alt);
mContent.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
final int p = (int)(32 * metrics.density);
@@ -102,7 +103,8 @@ public class PlatLogoActivity extends Activity {
@Override
public void onClick(View v) {
mToast.show();
- mContent.setImageResource(com.android.internal.R.drawable.platlogo);
+ mContent.setImageResource(isCid ? com.android.internal.R.drawable.cidlogo_alt
+ : com.android.internal.R.drawable.platlogo);
}
});
@@ -114,6 +116,7 @@ public class PlatLogoActivity extends Activity {
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_CLEAR_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
+ .putExtra("is_cid", isCid)
.addCategory("com.android.internal.category.PLATLOGO"));
//.setClassName("com.android.systemui","com.android.systemui.BeanBag"));
} catch (ActivityNotFoundException ex) {
diff --git a/core/res/res/drawable-nodpi/cidlogo.png b/core/res/res/drawable-nodpi/cidlogo.png
new file mode 100644
index 0000000..ceb2246
--- /dev/null
+++ b/core/res/res/drawable-nodpi/cidlogo.png
Binary files differ
diff --git a/core/res/res/drawable-nodpi/cidlogo_alt.png b/core/res/res/drawable-nodpi/cidlogo_alt.png
new file mode 100644
index 0000000..e5c03ed
--- /dev/null
+++ b/core/res/res/drawable-nodpi/cidlogo_alt.png
Binary files differ
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 66e1b40..7faa65c 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -974,6 +974,8 @@
<java-symbol type="drawable" name="picture_emergency" />
<java-symbol type="drawable" name="platlogo" />
<java-symbol type="drawable" name="platlogo_alt" />
+ <java-symbol type="drawable" name="cidlogo" />
+ <java-symbol type="drawable" name="cidlogo_alt" />
<java-symbol type="drawable" name="stat_notify_sync_error" />
<java-symbol type="drawable" name="stat_notify_wifi_in_range" />
<java-symbol type="drawable" name="stat_notify_rssi_in_range" />