packages/apps/Settings
| Revisão | fb09607469a5cb42c833725d121e517af5daca72 (tree) |
|---|---|
| Hora | 2011-06-10 10:22:02 |
| Autor | Freeman Ng <tenorslowworm@goog...> |
| Commiter | Android Git Automerger |
am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2
* commit '148222fd43499a578c16c0bdf6ae9336255facd7':
| @@ -97,8 +97,15 @@ public class DateTimeSettingsSetupWizard extends Activity | ||
| 97 | 97 | mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false, |
| 98 | 98 | R.layout.date_time_setup_custom_list_item_2); |
| 99 | 99 | |
| 100 | - final View layoutRoot = findViewById(R.id.layout_root); | |
| 101 | - layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK); | |
| 100 | + // For the normal view, disable Back since changes stick immediately | |
| 101 | + // and can't be canceled, and we already have a Next button. For xLarge, | |
| 102 | + // though, we save up our changes and set them upon Next, so Back can | |
| 103 | + // cancel. And also, in xlarge, we need the keyboard dismiss button | |
| 104 | + // to be available. | |
| 105 | + if (!mUsingXLargeLayout) { | |
| 106 | + final View layoutRoot = findViewById(R.id.layout_root); | |
| 107 | + layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK); | |
| 108 | + } | |
| 102 | 109 | } |
| 103 | 110 | |
| 104 | 111 | public void initUiForXl() { |
Fork
src/com/android/settings/DateTimeSettingsSetupWizard.java