Merge "Fix Bottom bar button cropped when Font and Display sizes are set to "Largest"." (4d85336b) · Commits · e / os / android_packages_apps_DocumentsUI

res/layout/fragment_pick.xml

+9 −13

Original line number	Diff line number	Diff line
		@@ -21,19 +21,15 @@
		android:baselineAligned="false"
		android:gravity="end"
		android:paddingEnd="@dimen/bottom_bar_padding_end">
		<TextView
		style="@style/BottomBarButton"
		<Button
		style="@style/BottomBarButton.Secondary"
		android:id="@android:id/button2"
		android:layout_width="@dimen/bottom_bar_negative_button_width"
		android:background="@android:color/transparent"
		android:text="@android:string/cancel"
		android:textColor="@color/primary"/>
		<TextView
		style="@style/BottomBarButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@android:string/cancel" />
		<Button
		style="@style/BottomBarButton.Primary"
		android:id="@android:id/button1"
		android:layout_width="@dimen/bottom_bar_positive_button_width"
		android:layout_marginStart="@dimen/bottom_bar_positive_button_margin_start"
		android:background="@drawable/bottom_bar_positive_button_background"
		android:elevation="@dimen/bottom_bar_positive_button_elevation"
		android:textColor="@android:color/white"/>
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />
		</LinearLayout>

res/layout/fragment_save.xml

+5 −8

Original line number	Diff line number	Diff line
		@@ -51,15 +51,12 @@
		android:layout_width="wrap_content"
		android:layout_height="match_parent">

		<TextView
		style="@style/BottomBarButton"
		<Button
		style="@style/BottomBarButton.Primary"
		android:id="@android:id/button1"
		android:layout_width="@dimen/bottom_bar_positive_button_width"
		android:layout_marginStart="@dimen/bottom_bar_positive_button_margin_start"
		android:background="@drawable/bottom_bar_positive_button_background"
		android:text="@string/menu_save"
		android:elevation="@dimen/bottom_bar_positive_button_elevation"
		android:textColor="@android:color/white"/>
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/menu_save" />

		<ProgressBar
		android:id="@android:id/progress"

res/values/dimens.xml

+3 −4

Original line number	Diff line number	Diff line
		@@ -65,10 +65,9 @@

		<dimen name="bottom_bar_height">56dp</dimen>
		<dimen name="bottom_bar_padding_end">10dp</dimen>
		<dimen name="bottom_bar_negative_button_width">88.5dp</dimen>
		<dimen name="bottom_bar_positive_button_margin_start">8dp</dimen>
		<dimen name="bottom_bar_positive_button_width">73dp</dimen>
		<dimen name="bottom_bar_positive_button_elevation">2dp</dimen>
		<dimen name="bottom_bar_button_height">36dip</dimen>
		<dimen name="bottom_bar_button_horizontal_padding">24dp</dimen>
		<dimen name="bottom_bar_button_corner_radius">4dp</dimen>

		<dimen name="inspector_header_height">250dp</dimen>
		</resources>

res/values/styles.xml

+22 −6

Original line number	Diff line number	Diff line
		@@ -53,13 +53,29 @@
		<item name="android:maxHeight">3dp</item>
		</style>

		<style name="BottomBarButton">
		<item name="android:layout_height">36dp</item>
		<style name="BottomBarButton.Primary" parent="Widget.AppCompat.Button.Colored">
		<item name="android:buttonStyle">@style/BottomBarButton.Primary</item>
		<item name="android:theme">@style/BottomBarButton.Primary</item>

		<item name="android:layout_gravity">center_vertical</item>
		<item name="android:gravity">center</item>
		<item name="android:fontFamily">sans-serif-medium</item>
		<item name="android:textSize">14sp</item>
		<item name="android:textAllCaps">true</item>
		<item name="android:layout_height">@dimen/bottom_bar_button_height</item>
		<item name="android:paddingLeft">@dimen/bottom_bar_button_horizontal_padding</item>
		<item name="android:paddingRight">@dimen/bottom_bar_button_horizontal_padding</item>
		<item name="android:fontFamily">google-sans-medium</item>
		<item name="android:textAllCaps">false</item>
		<item name="android:buttonCornerRadius">@dimen/bottom_bar_button_corner_radius</item>
		</style>

		<style name="BottomBarButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored">
		<item name="android:buttonStyle">@style/BottomBarButton.Secondary</item>
		<item name="android:theme">@style/BottomBarButton.Secondary</item>

		<item name="android:layout_gravity">center_vertical</item>
		<item name="android:layout_height">@dimen/bottom_bar_button_height</item>
		<item name="android:paddingLeft">@dimen/bottom_bar_button_horizontal_padding</item>
		<item name="android:paddingRight">@dimen/bottom_bar_button_horizontal_padding</item>
		<item name="android:fontFamily">google-sans-medium</item>
		<item name="android:textAllCaps">false</item>
		<item name="android:buttonCornerRadius">@dimen/bottom_bar_button_corner_radius</item>
		</style>
		</resources>

src/com/android/documentsui/picker/PickFragment.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,10 +98,10 @@ public class PickFragment extends Fragment {
		LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
		mContainer = inflater.inflate(R.layout.fragment_pick, container, false);

		mPick = (TextView) mContainer.findViewById(android.R.id.button1);
		mPick = (Button) mContainer.findViewById(android.R.id.button1);
		mPick.setOnClickListener(mPickListener);

		mCancel = (TextView) mContainer.findViewById(android.R.id.button2);
		mCancel = (Button) mContainer.findViewById(android.R.id.button2);
		mCancel.setOnClickListener(mCancelListener);

		updateView();