| Revisión | c5efc2552196b493e9ae669c5cee1fd0a4e5e327 (tree) |
|---|---|
| Tiempo | 2019-08-20 14:17:45 |
| Autor | Braden Farmer <farmerbb@gmai...> |
| Commiter | Braden Farmer |
Fixes for collapsing Taskbar when showing SelectAppActivity
app/src/main/java/com/farmerbb/taskbar/activity/DesktopIconSelectAppActivity.java (diff) app/src/main/java/com/farmerbb/taskbar/activity/SelectAppActivity.java (diff)| @@ -56,6 +56,8 @@ public class DesktopIconSelectAppActivity extends AppCompatActivity { | ||
| 56 | 56 | |
| 57 | 57 | private DesktopIconInfo desktopIcon; |
| 58 | 58 | |
| 59 | + private boolean isCollapsed; | |
| 60 | + | |
| 59 | 61 | @Override |
| 60 | 62 | protected void onCreate(Bundle savedInstanceState) { |
| 61 | 63 | super.onCreate(savedInstanceState); |
| @@ -76,7 +78,11 @@ public class DesktopIconSelectAppActivity extends AppCompatActivity { | ||
| 76 | 78 | getWindow().setElevation(0); |
| 77 | 79 | } |
| 78 | 80 | |
| 79 | - LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_HIDE_TASKBAR")); | |
| 81 | + SharedPreferences pref = U.getSharedPreferences(this); | |
| 82 | + isCollapsed = !pref.getBoolean("collapsed", false); | |
| 83 | + | |
| 84 | + if(!isCollapsed) | |
| 85 | + LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.HIDE_TASKBAR")); | |
| 80 | 86 | |
| 81 | 87 | progressBar = findViewById(R.id.progress_bar); |
| 82 | 88 | appList = findViewById(R.id.list); |
| @@ -90,8 +96,8 @@ public class DesktopIconSelectAppActivity extends AppCompatActivity { | ||
| 90 | 96 | if(appListGenerator != null && appListGenerator.getStatus() == AsyncTask.Status.RUNNING) |
| 91 | 97 | appListGenerator.cancel(true); |
| 92 | 98 | |
| 93 | - if(!U.shouldCollapse(this, false)) | |
| 94 | - LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_SHOW_TASKBAR")); | |
| 99 | + if(!isCollapsed) | |
| 100 | + LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR")); | |
| 95 | 101 | |
| 96 | 102 | super.finish(); |
| 97 | 103 | } |
| @@ -58,6 +58,8 @@ public class SelectAppActivity extends AppCompatActivity { | ||
| 58 | 58 | private AppListAdapter hiddenAdapter; |
| 59 | 59 | private AppListAdapter topAppsAdapter; |
| 60 | 60 | |
| 61 | + private boolean isCollapsed; | |
| 62 | + | |
| 61 | 63 | private class SelectAppPagerAdapter extends FragmentPagerAdapter { |
| 62 | 64 | |
| 63 | 65 | SelectAppPagerAdapter(FragmentManager fm) { |
| @@ -107,7 +109,11 @@ public class SelectAppActivity extends AppCompatActivity { | ||
| 107 | 109 | getWindow().setElevation(0); |
| 108 | 110 | } |
| 109 | 111 | |
| 110 | - LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_HIDE_TASKBAR")); | |
| 112 | + SharedPreferences pref = U.getSharedPreferences(this); | |
| 113 | + isCollapsed = !pref.getBoolean("collapsed", false); | |
| 114 | + | |
| 115 | + if(!isCollapsed) | |
| 116 | + LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.HIDE_TASKBAR")); | |
| 111 | 117 | |
| 112 | 118 | progressBar = findViewById(R.id.progress_bar); |
| 113 | 119 | appListGenerator = new AppListGenerator(); |
| @@ -140,8 +146,8 @@ public class SelectAppActivity extends AppCompatActivity { | ||
| 140 | 146 | if(appListGenerator != null && appListGenerator.getStatus() == AsyncTask.Status.RUNNING) |
| 141 | 147 | appListGenerator.cancel(true); |
| 142 | 148 | |
| 143 | - if(!U.shouldCollapse(this, false)) | |
| 144 | - LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_SHOW_TASKBAR")); | |
| 149 | + if(!isCollapsed) | |
| 150 | + LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR")); | |
| 145 | 151 | |
| 146 | 152 | super.finish(); |
| 147 | 153 | } |
Android-x86
Fork