|
15 | 15 | import android.support.v4.app.FragmentManager; |
16 | 16 | import android.support.v4.app.FragmentPagerAdapter; |
17 | 17 | import android.support.v4.view.ViewPager; |
| 18 | +import android.util.Log; |
18 | 19 | import android.view.Menu; |
19 | 20 | import android.view.MenuItem; |
20 | 21 |
|
@@ -143,28 +144,21 @@ public boolean onOptionsItemSelected(MenuItem item) { |
143 | 144 | @Override |
144 | 145 | protected void onActivityResult (int requestCode, int resultCode, Intent data) { |
145 | 146 | //extract data from Intent URI and update values in spectrogram code accordingly |
146 | | -// Log.d("SpectroActivity","Activity result"); |
147 | | -// |
148 | | -// if (requestCode == PREF_REQUEST_CODE && resultCode == RESULT_OK) { |
149 | | -// Log.d("SpectroActivity","Preference changed!"); |
150 | | -// String key = data.getStringExtra("PREF_KEY"); |
151 | | -// Log.d("SpectroActivity","Key: "+key); |
152 | | -// if (key.equals(BitmapGenerator.PREF_COLOURMAP_KEY)) { |
153 | | -// lssv.updateColourMap(); |
154 | | -// } |
155 | | -// |
156 | | -// else if (key.equals(PREF_PORTRAIT_KEY)) { |
157 | | -// SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); |
158 | | -// boolean portrait = prefs.getBoolean(PREF_PORTRAIT_KEY, false); |
159 | | -// if (portrait) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); |
160 | | -// else setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR); |
161 | | -// } |
162 | | -// |
163 | | -// else if (key.equals(BitmapGenerator.PREF_CONTRAST_KEY)) { |
164 | | -// lssv.updateContrast(); |
165 | | -// } |
166 | | -// |
167 | | -// } |
| 147 | + Log.d("SpectroActivity","Activity result"); |
| 148 | + |
| 149 | + if (requestCode == PREF_REQUEST_CODE && resultCode == RESULT_OK) { |
| 150 | + Log.d("SpectroActivity","Preference changed!"); |
| 151 | + String key = data.getStringExtra("PREF_KEY"); |
| 152 | + Log.d("SpectroActivity","Key: "+key); |
| 153 | + |
| 154 | + if (key.equals(PREF_LANDSCAPE_KEY)) { |
| 155 | + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); |
| 156 | + boolean landscape = prefs.getBoolean(PREF_LANDSCAPE_KEY, false); |
| 157 | + if (landscape) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); |
| 158 | + else setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR); |
| 159 | + } |
| 160 | + |
| 161 | + } |
168 | 162 | } |
169 | 163 |
|
170 | 164 | @Override |
|
0 commit comments