summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAravind Asam <aasam@codeaurora.org>2014-03-11 21:48:44 -0700
committerAdnan <adnan@cyngn.com>2014-08-26 14:46:52 -0700
commit8ac324142b32005270f829aa62cc4c201b6cf4b5 (patch)
treec7477b3ac493024d7c4855bb5f46f1bc2d887c42
parent03bc1c6e8a8b40bab565738e4f3923ac399e6430 (diff)
downloadandroid_packages_apps_Calendar-8ac324142b32005270f829aa62cc4c201b6cf4b5.tar.gz
android_packages_apps_Calendar-8ac324142b32005270f829aa62cc4c201b6cf4b5.tar.bz2
android_packages_apps_Calendar-8ac324142b32005270f829aa62cc4c201b6cf4b5.zip
Modified file action_mode.xml
action_mode.xml with the changes. Copyright updated. Temporarily disabled use of dropdown icon till it is merged. Change-Id: Idd40cde01b9487fdea11823886def1cf416df08f
-rw-r--r--res/layout/action_mode.xml65
1 files changed, 37 insertions, 28 deletions
diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index 6c516e61..d7890182 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ Not a Contribution.
+
+ Copyright (C) 2010 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,35 +17,41 @@
limitations under the License.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/navigation_bar"
- android:layout_width="match_parent"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/navigation_bar"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <FrameLayout
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:orientation="horizontal">
+ android:layout_alignParentLeft="true" >
- <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ <ImageView
android:layout_width="wrap_content"
- android:layout_height="match_parent">
- <ImageView android:layout_gravity="right"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:src="@drawable/dropdown_ic_arrow_normal_holo_dark" />
- <Button android:id="@+id/selection_menu"
- style="?android:attr/actionButtonStyle"
- android:divider="?android:attr/listDividerAlertDialog"
- android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
- android:textColor="?android:attr/actionMenuTextColor"
- android:singleLine="true"
- android:gravity="left|center_vertical"
- android:paddingRight="25dip"
- android:layout_width="wrap_content"
- android:layout_height="match_parent" />
- </FrameLayout>
- <ImageView android:layout_marginLeft="16dip"
- android:layout_marginRight="8dip"
+ android:layout_height="match_parent"
+ android:layout_gravity="right" />
+
+ <Button
+ android:id="@+id/selection_menu"
+ style="?android:attr/actionButtonStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:gravity="bottom"
- android:src="@drawable/cab_divider_vertical_dark" />
-</LinearLayout>
+ android:divider="?android:attr/listDividerAlertDialog"
+ android:gravity="left|center_vertical"
+ android:onClick="onSelectionButtonClicked"
+ android:paddingRight="25dip"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
+ android:textColor="?android:attr/actionMenuTextColor" />
+ </FrameLayout>
+
+ <View
+ android:layout_width="1dp"
+ android:layout_height="match_parent"
+ android:layout_alignParentRight="true"
+ android:layout_marginBottom="9dp"
+ android:layout_marginTop="9dp"
+ android:background="#F0B0B0B0" />
+
+</RelativeLayout>