diff options
| author | yingying <yingying@codeaurora.org> | 2013-12-30 03:53:21 -0500 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-08-25 18:37:45 -0700 |
| commit | d18341a463bee0b027785ed0f3cee9d0a7f00763 (patch) | |
| tree | 4a168279d951e1ee35e6204dc748d1b4f85108bd /res | |
| parent | c0f335c6b7c9900dc5fea1bfc220552a1be39331 (diff) | |
| download | android_packages_apps_Calendar-d18341a463bee0b027785ed0f3cee9d0a7f00763.tar.gz android_packages_apps_Calendar-d18341a463bee0b027785ed0f3cee9d0a7f00763.tar.bz2 android_packages_apps_Calendar-d18341a463bee0b027785ed0f3cee9d0a7f00763.zip | |
Calendar: Support display the lunar info.
- It will show the lunar info on the Month, Week and Day view.
- If the current displayed language is not Chinese, it will not show the
lunar info for on these views.
Change-Id: I1aeb4bc27dbdd127e69ceb0bf50abc1509cf4bb2
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/actionbar_pulldown_menu_top_button.xml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/res/layout/actionbar_pulldown_menu_top_button.xml b/res/layout/actionbar_pulldown_menu_top_button.xml index 27bc29e4..746592df 100644 --- a/res/layout/actionbar_pulldown_menu_top_button.xml +++ b/res/layout/actionbar_pulldown_menu_top_button.xml @@ -14,8 +14,7 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="48dip" android:gravity="center_vertical" @@ -29,15 +28,30 @@ android:textSize="12sp" android:layout_marginTop="-2dip" android:layout_marginBottom="-8dip" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:textColor="@color/calendar_view_switch_menu_text_color" + android:gravity="left" /> + + <TextView android:id="@+id/top_button_lunar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="-2dip" + android:layout_marginBottom="-8dip" + android:layout_marginLeft="8dip" + android:layout_toRightOf="@id/top_button_weekday" + android:singleLine="true" + android:textSize="12sp" android:textColor="@color/calendar_view_switch_menu_text_color" android:gravity="left" /> <TextView android:id="@+id/top_button_date" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/top_button_weekday" android:singleLine="true" android:textSize="@dimen/action_bar_date_text_size" android:textColor="@color/calendar_view_switch_menu_text_color" android:gravity="left" /> -</LinearLayout> - +</RelativeLayout>
\ No newline at end of file |