From ccac6233229f07f48cdc872c058d96754d1d4983 Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Sun, 18 Sep 2011 09:42:52 -0500 Subject: [PATCH] Remove exit button --- orig/fullscreen.svg | 62 ------------------ orig/kill.svg | 28 -------- res/drawable/fullscreen.png | Bin 782 -> 0 bytes res/drawable/kill.png | Bin 830 -> 0 bytes res/layout/mini_playback.xml | 20 +----- res/values/strings.xml | 1 - src/org/kreed/vanilla/ContextApplication.java | 13 ---- .../kreed/vanilla/MiniPlaybackActivity.java | 12 +--- src/org/kreed/vanilla/PlaybackActivity.java | 22 ------- .../kreed/vanilla/PreferencesActivity.java | 18 ----- 10 files changed, 4 insertions(+), 172 deletions(-) delete mode 100644 orig/fullscreen.svg delete mode 100644 orig/kill.svg delete mode 100644 res/drawable/fullscreen.png delete mode 100644 res/drawable/kill.png diff --git a/orig/fullscreen.svg b/orig/fullscreen.svg deleted file mode 100644 index 5cb5701f..00000000 --- a/orig/fullscreen.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/orig/kill.svg b/orig/kill.svg deleted file mode 100644 index 52a8ad71..00000000 --- a/orig/kill.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - diff --git a/res/drawable/fullscreen.png b/res/drawable/fullscreen.png deleted file mode 100644 index f2527582323f6ecc55b9484c8746864c40485cbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 782 zcmV+p1M&QcP)S=bQO?*`1lClVw@wIggG9@Bkj*|9`Gl ztFK9t+zLjtTrNLzonkI*XxwmzQtAsEAdcf7_uKo7Gq#&;7VEe_pU>ZN0WcRfu;uze zOwIv{;1`RUijc2pjr>2__8qhk*3edb?G~U?; z4_jy)Wd$A~lpRDKyy6Al8o=XTQ2I^+fw{0b`YE)tp(74N9z4yJ1m6e%jwq3=>KvMt z*b8Bve8kb(^=SoQo@_W8jXu(Qx6bkA&nBZRepLm4&oGCvnqA{FEPRRqir|Y3yI!wf z(cir)2$R$X`!cf0z=M4n@Bv@N`~pG-pyQw%d@&5f&)oowgOHQd@(fIKpVEMK5qudM zu^=Wk02NzjRZns_9KJ3?pj-)AJE@p$}R zssS6=<{G30&4cy>cq+6hucy=L2U`u;LPJu?`i{&4cmNOZLI9riF^Z&v%;_qTLCa|( zqqKcmQ%dw&C?$F|rNpVE8ts$dprV-Twph${D~h=RVzMcxgK{}d72)@`%W3%7DW?N@ zIsI=#(?@fml=^n4h6cV&L({izXv%_VlK!Um2Sz6q*0z+TE^Ck0gYkLLralxj_2I#q zdY8dBfoSbwOB%c_L|d1;VbiNcE`)P{gkG*LccFEh6;S%F@%1|Mim}Z-5ZV5~A-Q5~ z`xJ_#KQT$~M@0aXF)v}j9y$)l=9~+Fxu|Ub?*IS* M07*qoM6N<$g08q-HUIzs diff --git a/res/drawable/kill.png b/res/drawable/kill.png deleted file mode 100644 index 63eb4a6149ff4af4ee93bf89056ded9c76f30856..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 830 zcmV-E1Ht@>P)K~!ko?U}!86LA>E(}+LN#l?b?lS}TlFQ|CAvrHqilw50+Q#P-S_mPRD9y?Hg&SVTaKrO_^Sr;F zw=f!w3NA+>Cy*1!3D^NsDwT?@R_k83+dbzTfl8%v$@l%&iY@2(#G@VYrB8kBk8=*cPl0d=w)w9 z9-UdhiC)wT$O&_^5HpNk_K7OXej0cs@lO%FZ*G{Y*X!3LnRhg$H1LF^^-A9tO%c$m zuS*uuJm6#L^m>uLT{AOIs{~#Upl6cIw?*J3o!@~UJT$crXm)?B68U`*ctY}eE18`! zx6sg}1n#|F_%IDTBpZ#!9kUzRQNwybc}z>)9SwwU^J#Yrh#X)X2iDI$W~ZRW|qrj zTrRg+Zp?b4tc9$HGfLzh>*TT;R#wyKDvS9vcoz6&G^xx9V2Mn1*aNJSWvz>u65xd~ zr6we^i)n>Z4Tv2$AsG+5(3t}VMl4MUV-|xJqt=-V4Hh_7IF>lpI2O4xCnk;$ z93ePHaFlTFM#lMvGZ5z>=Z<{LFdX1G#N}7YoIp+>C$O~m1NlX8$Sm9-EC2ui07*qo IM6N<$f;dcUxc~qF diff --git a/res/layout/mini_playback.xml b/res/layout/mini_playback.xml index bc3ce5e9..a10d0398 100644 --- a/res/layout/mini_playback.xml +++ b/res/layout/mini_playback.xml @@ -34,22 +34,4 @@ THE SOFTWARE. android:layout_width="wrap_content"> - - - - - \ No newline at end of file + diff --git a/res/values/strings.xml b/res/values/strings.xml index b56901e0..b661c95a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -28,7 +28,6 @@ THE SOFTWARE. No songs selected. Pick some from the library (search key) or enter random mode (in the menu). Preferences Library - Stop and Exit Display Mode Enable Shuffle Disable Shuffle diff --git a/src/org/kreed/vanilla/ContextApplication.java b/src/org/kreed/vanilla/ContextApplication.java index b1996c2a..5c97d715 100644 --- a/src/org/kreed/vanilla/ContextApplication.java +++ b/src/org/kreed/vanilla/ContextApplication.java @@ -171,17 +171,4 @@ public class ContextApplication extends Application { if (mInstance != null) mInstance.sendBroadcast(intent); } - - /** - * Stop the PlaybackService, if running, and close all Activities that - * have been added with addActivity. - */ - public static void quit() - { - if (mActivities != null) { - for (int i = mActivities.size(); --i != -1; ) - mActivities.remove(i).finish(); - } - mInstance.stopService(new Intent(mInstance, PlaybackService.class)); - } } diff --git a/src/org/kreed/vanilla/MiniPlaybackActivity.java b/src/org/kreed/vanilla/MiniPlaybackActivity.java index a06f41aa..ec38cf66 100644 --- a/src/org/kreed/vanilla/MiniPlaybackActivity.java +++ b/src/org/kreed/vanilla/MiniPlaybackActivity.java @@ -32,7 +32,7 @@ import android.view.Window; * window is not fullscreen but only as large as it needs to be. Includes a * CoverView and control buttons. */ -public class MiniPlaybackActivity extends PlaybackActivity implements View.OnClickListener { +public class MiniPlaybackActivity extends PlaybackActivity { @Override public void onCreate(Bundle state) { @@ -42,12 +42,9 @@ public class MiniPlaybackActivity extends PlaybackActivity implements View.OnCli setContentView(R.layout.mini_playback); mCoverView = (CoverView)findViewById(R.id.cover_view); + mCoverView.setOnClickListener(this); mCoverView.setup(mLooper, this, CoverBitmap.STYLE_OVERLAPPING_BOX); - View openButton = findViewById(R.id.open_button); - openButton.setOnClickListener(this); - View killButton = findViewById(R.id.kill_button); - killButton.setOnClickListener(this); View previousButton = findViewById(R.id.previous); previousButton.setOnClickListener(this); mPlayPauseButton = (ControlButton)findViewById(R.id.play_pause); @@ -60,10 +57,7 @@ public class MiniPlaybackActivity extends PlaybackActivity implements View.OnCli public void onClick(View view) { switch (view.getId()) { - case R.id.kill_button: - ContextApplication.quit(); - break; - case R.id.open_button: + case R.id.cover_view: startActivity(new Intent(this, FullPlaybackActivity.class)); finish(); break; diff --git a/src/org/kreed/vanilla/PlaybackActivity.java b/src/org/kreed/vanilla/PlaybackActivity.java index 9a109bc9..91b93f41 100644 --- a/src/org/kreed/vanilla/PlaybackActivity.java +++ b/src/org/kreed/vanilla/PlaybackActivity.java @@ -118,17 +118,6 @@ public class PlaybackActivity extends Activity implements Handler.Callback, View } } - public static boolean handleKeyLongPress(int keyCode) - { - switch (keyCode) { - case KeyEvent.KEYCODE_BACK: - ContextApplication.quit(); - return true; - } - - return false; - } - @Override public boolean onKeyDown(int keyCode, KeyEvent event) { @@ -157,12 +146,6 @@ public class PlaybackActivity extends Activity implements Handler.Callback, View return super.onKeyUp(keyCode, event); } - @Override - public boolean onKeyLongPress(int keyCode, KeyEvent event) - { - return handleKeyLongPress(keyCode); - } - public void nextSong() { setSong(ContextApplication.getService().nextSong()); @@ -291,7 +274,6 @@ public class PlaybackActivity extends Activity implements Handler.Callback, View { } - static final int MENU_QUIT = 0; static final int MENU_DISPLAY = 1; static final int MENU_PREFS = 2; static final int MENU_LIBRARY = 3; @@ -308,7 +290,6 @@ public class PlaybackActivity extends Activity implements Handler.Callback, View menu.add(0, MENU_SHUFFLE, 0, R.string.shuffle_enable).setIcon(R.drawable.ic_menu_shuffle); menu.add(0, MENU_REPEAT, 0, R.string.repeat_enable).setIcon(R.drawable.ic_menu_refresh); menu.add(0, MENU_RANDOM, 0, R.string.random_enable).setIcon(R.drawable.ic_menu_shuffle); - menu.add(0, MENU_QUIT, 0, R.string.quit).setIcon(R.drawable.ic_menu_close_clear_cancel); return true; } @@ -330,9 +311,6 @@ public class PlaybackActivity extends Activity implements Handler.Callback, View public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case MENU_QUIT: - ContextApplication.quit(); - return true; case MENU_SHUFFLE: toggleShuffle(); return true; diff --git a/src/org/kreed/vanilla/PreferencesActivity.java b/src/org/kreed/vanilla/PreferencesActivity.java index 5f799ebd..e15bc5ca 100644 --- a/src/org/kreed/vanilla/PreferencesActivity.java +++ b/src/org/kreed/vanilla/PreferencesActivity.java @@ -24,7 +24,6 @@ package org.kreed.vanilla; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.view.KeyEvent; /** * The preferences activity in which one can change application preferences. @@ -37,23 +36,6 @@ public class PreferencesActivity extends PreferenceActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ContextApplication.addActivity(this); addPreferencesFromResource(R.xml.preferences); } - - @Override - public void onDestroy() - { - super.onDestroy(); - ContextApplication.removeActivity(this); - } - - /** - * Implement the long-press-back-quits-application behavior. - */ - @Override - public boolean onKeyLongPress(int keyCode, KeyEvent event) - { - return PlaybackActivity.handleKeyLongPress(keyCode); - } }