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

am 39b7bd8c: Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev

Browse Source 
* commit '39b7bd8cbcd4413e8ab4dae5caa2b34f38530c95':
  Use uniform font size for APNs and timezones. DO NOT MERGE.
This commit is contained in:
Jeff Sharkey
2012-11-29 18:00:37 -08:00
committed by Android Git Automerger
parent a04497d70c 39b7bd8cbc
commit 90dbd6936c
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/layout/apn_preference_layout.xml
View File

@@ -23,15 +23,14 @@
<RelativeLayout
android:id="@+android:id/text_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16sp"
android:layout_marginEnd="6sp"
android:layout_marginTop="6sp"
android:layout_marginBottom="6sp"
android:layout_width="0dip"
android:layout_height="match_parent"
android:paddingStart="8dip"
android:paddingEnd="8dip"
android:gravity="center_vertical"
android:layout_weight="1"
android:focusable="true"
android:background="@android:drawable/menuitem_background">
android:background="?android:attr/selectableItemBackground">
<TextView
android:id="@+android:id/title"
@@ -39,7 +38,7 @@
android:layout_height="wrap_content"
android:focusable="true"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+android:id/summary"
@@ -57,8 +56,8 @@
android:id="@+android:id/apn_radiobutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dip"
android:layout_marginEnd="4dip"
android:layout_marginStart="8dip"
android:layout_marginEnd="8dip"
android:layout_gravity="center_vertical"
android:clickable="true" />

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

@@ -81,7 +81,7 @@ public class ZonePicker extends ListFragment {
public static SimpleAdapter constructTimezoneAdapter(Context context,
boolean sortedByName) {
return constructTimezoneAdapter(context, sortedByName,
android.R.layout.simple_list_item_2);
R.layout.date_time_setup_custom_list_item_2);
}
/**