Increase padding above labels in setup flow
b/13640327 Change-Id: I54e98855566adc45dcd410186c2e7ea322dc1a58
This commit is contained in:
parent
35bda06a1c
commit
9d06daa803
@ -48,7 +48,8 @@
|
|||||||
<Spinner
|
<Spinner
|
||||||
android:id="@+id/account_security_type"
|
android:id="@+id/account_security_type"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:contentDescription="@string/account_setup_outgoing_security_label" />
|
||||||
</TableRow>
|
</TableRow>
|
||||||
<TableRow
|
<TableRow
|
||||||
android:paddingTop="16dip" >
|
android:paddingTop="16dip" >
|
||||||
|
@ -45,4 +45,7 @@
|
|||||||
<dimen name="setup_basics_logo_margin_top">28dp</dimen>
|
<dimen name="setup_basics_logo_margin_top">28dp</dimen>
|
||||||
<dimen name="setup_basics_logo_margin_bottom">56dp</dimen>
|
<dimen name="setup_basics_logo_margin_bottom">56dp</dimen>
|
||||||
|
|
||||||
|
<!-- Account setup row labels -->
|
||||||
|
<dimen name="setup_label_text_padding_top">0dp</dimen>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -79,6 +79,9 @@
|
|||||||
<dimen name="setup_basics_logo_margin_top">4dp</dimen>
|
<dimen name="setup_basics_logo_margin_top">4dp</dimen>
|
||||||
<dimen name="setup_basics_logo_margin_bottom">4dp</dimen>
|
<dimen name="setup_basics_logo_margin_bottom">4dp</dimen>
|
||||||
|
|
||||||
|
<!-- Account setup row labels -->
|
||||||
|
<dimen name="setup_label_text_padding_top">16dp</dimen>
|
||||||
|
|
||||||
<!-- TODO: probably delete these -->
|
<!-- TODO: probably delete these -->
|
||||||
<!-- Notification dialog -->
|
<!-- Notification dialog -->
|
||||||
<dimen name="dialog_text_size">10sp</dimen>
|
<dimen name="dialog_text_size">10sp</dimen>
|
||||||
|
@ -77,6 +77,7 @@
|
|||||||
<style name="account_setup_label_text">
|
<style name="account_setup_label_text">
|
||||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||||
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
|
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
|
||||||
|
<item name="android:paddingTop">@dimen/setup_label_text_padding_top</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!-- Account setup checkboxes -->
|
<!-- Account setup checkboxes -->
|
||||||
|
@ -110,8 +110,6 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
|
|||||||
R.string.account_setup_outgoing_headline);
|
R.string.account_setup_outgoing_headline);
|
||||||
}
|
}
|
||||||
|
|
||||||
final Context context = getActivity();
|
|
||||||
|
|
||||||
mUsernameView = UiUtilities.getView(view, R.id.account_username);
|
mUsernameView = UiUtilities.getView(view, R.id.account_username);
|
||||||
mAuthenticationView = UiUtilities.getView(view, R.id.authentication_view);
|
mAuthenticationView = UiUtilities.getView(view, R.id.authentication_view);
|
||||||
mServerView = UiUtilities.getView(view, R.id.account_server);
|
mServerView = UiUtilities.getView(view, R.id.account_server);
|
||||||
@ -123,26 +121,6 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
|
|||||||
// UiUtilities throws an exception in this case.
|
// UiUtilities throws an exception in this case.
|
||||||
mAuthenticationLabel = (TextView)view.findViewById(R.id.authentication_label);
|
mAuthenticationLabel = (TextView)view.findViewById(R.id.authentication_label);
|
||||||
|
|
||||||
// Note: Strings are shared with AccountSetupIncomingFragment
|
|
||||||
final SpinnerOption securityTypes[] = {
|
|
||||||
new SpinnerOption(HostAuth.FLAG_NONE, context.getString(
|
|
||||||
R.string.account_setup_incoming_security_none_label)),
|
|
||||||
new SpinnerOption(HostAuth.FLAG_SSL, context.getString(
|
|
||||||
R.string.account_setup_incoming_security_ssl_label)),
|
|
||||||
new SpinnerOption(HostAuth.FLAG_SSL | HostAuth.FLAG_TRUST_ALL, context.getString(
|
|
||||||
R.string.account_setup_incoming_security_ssl_trust_certificates_label)),
|
|
||||||
new SpinnerOption(HostAuth.FLAG_TLS, context.getString(
|
|
||||||
R.string.account_setup_incoming_security_tls_label)),
|
|
||||||
new SpinnerOption(HostAuth.FLAG_TLS | HostAuth.FLAG_TRUST_ALL, context.getString(
|
|
||||||
R.string.account_setup_incoming_security_tls_trust_certificates_label)),
|
|
||||||
};
|
|
||||||
|
|
||||||
final ArrayAdapter<SpinnerOption> securityTypesAdapter =
|
|
||||||
new ArrayAdapter<SpinnerOption>(context, android.R.layout.simple_spinner_item,
|
|
||||||
securityTypes);
|
|
||||||
securityTypesAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
|
||||||
mSecurityTypeView.setAdapter(securityTypesAdapter);
|
|
||||||
|
|
||||||
// Updates the port when the user changes the security type. This allows
|
// Updates the port when the user changes the security type. This allows
|
||||||
// us to show a reasonable default which the user can change.
|
// us to show a reasonable default which the user can change.
|
||||||
mSecurityTypeView.post(new Runnable() {
|
mSecurityTypeView.post(new Runnable() {
|
||||||
@ -192,6 +170,28 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
|
|||||||
@Override
|
@Override
|
||||||
public void onActivityCreated(Bundle savedInstanceState) {
|
public void onActivityCreated(Bundle savedInstanceState) {
|
||||||
super.onActivityCreated(savedInstanceState);
|
super.onActivityCreated(savedInstanceState);
|
||||||
|
|
||||||
|
final Context context = getActivity();
|
||||||
|
// Note: Strings are shared with AccountSetupIncomingFragment
|
||||||
|
final SpinnerOption securityTypes[] = {
|
||||||
|
new SpinnerOption(HostAuth.FLAG_NONE, context.getString(
|
||||||
|
R.string.account_setup_incoming_security_none_label)),
|
||||||
|
new SpinnerOption(HostAuth.FLAG_SSL, context.getString(
|
||||||
|
R.string.account_setup_incoming_security_ssl_label)),
|
||||||
|
new SpinnerOption(HostAuth.FLAG_SSL | HostAuth.FLAG_TRUST_ALL, context.getString(
|
||||||
|
R.string.account_setup_incoming_security_ssl_trust_certificates_label)),
|
||||||
|
new SpinnerOption(HostAuth.FLAG_TLS, context.getString(
|
||||||
|
R.string.account_setup_incoming_security_tls_label)),
|
||||||
|
new SpinnerOption(HostAuth.FLAG_TLS | HostAuth.FLAG_TRUST_ALL, context.getString(
|
||||||
|
R.string.account_setup_incoming_security_tls_trust_certificates_label)),
|
||||||
|
};
|
||||||
|
|
||||||
|
final ArrayAdapter<SpinnerOption> securityTypesAdapter =
|
||||||
|
new ArrayAdapter<SpinnerOption>(context, android.R.layout.simple_spinner_item,
|
||||||
|
securityTypes);
|
||||||
|
securityTypesAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||||
|
mSecurityTypeView.setAdapter(securityTypesAdapter);
|
||||||
|
|
||||||
loadSettings();
|
loadSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user