PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e4df0b3e: am 46f4b754: Merge "Enlarge texts and fit the other elements" into honeycomb

Browse Source 
* commit 'e4df0b3ec87ddcb6d480ffff5c954d9eee7bef74':
  Enlarge texts and fit the other elements
This commit is contained in:
Daisuke Miyakawa
2011-01-28 16:28:57 -08:00
committed by Android Git Automerger
parent 096b3bc894 e4df0b3ec8
commit 22e57a880f
8 changed files with 137 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DateTimeSettingsSetupWizard.java
View File

@@ -101,7 +101,7 @@ public class DateTimeSettingsSetupWizard extends Activity
// mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
mTimeZoneButton.setOnClickListener(this);
mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,
R.layout.custom_list_item);
R.layout.date_time_setup_custom_list_item_2);
final boolean autoDateTimeEnabled;
final Intent intent = getIntent();

7
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -159,6 +159,13 @@ public class WifiConfigController implements TextWatcher,
mSsidView.addTextChangedListener(this);
mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
mSecuritySpinner.setOnItemSelectedListener(this);
if (context instanceof WifiSettingsForSetupWizardXL) {
// We want custom layout. The content must be same as the other cases.
mSecuritySpinner.setAdapter(
new ArrayAdapter<String>(context, R.layout.wifi_setup_custom_list_item_1,
android.R.id.text1,
context.getResources().getStringArray(R.array.wifi_security)));
}
mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
} else {
mConfigUi.setTitle(mAccessPoint.ssid);