Merge "resolve merge conflicts of 7145cac to master"
diff --git a/core/java/android/annotation/AnyThread.java b/core/java/android/annotation/AnyThread.java
new file mode 100644
index 0000000..c101548c
--- /dev/null
+++ b/core/java/android/annotation/AnyThread.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+/**
+ * Denotes that the annotated method can be called from any thread (e.g. it is "thread safe".)
+ * If the annotated element is a class, then all methods in the class can be called
+ * from any thread.
+ * <p>
+ * The main purpose of this method is to indicate that you believe a method can be called
+ * from any thread; static tools can then check that nothing you call from within this method
+ * or class have more strict threading requirements.
+ * <p>
+ * Example:
+ * <pre><code>
+ * @AnyThread
+ * public void deliverResult(D data) { ... }
+ * </code></pre>
+ *
+ * {@hide}
+ */
+@Retention(SOURCE)
+@Target({METHOD,CONSTRUCTOR,TYPE})
+public @interface AnyThread {
+}
diff --git a/core/java/android/annotation/Dimension.java b/core/java/android/annotation/Dimension.java
new file mode 100644
index 0000000..5f705ad5
--- /dev/null
+++ b/core/java/android/annotation/Dimension.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+/**
+ * Denotes that a numeric parameter, field or method return value is expected
+ * to represent a dimension.
+ *
+ * {@hide}
+ */
+@Documented
+@Retention(SOURCE)
+@Target({METHOD,PARAMETER,FIELD,LOCAL_VARIABLE,ANNOTATION_TYPE})
+public @interface Dimension {
+ @Unit
+ int unit() default PX;
+
+ int DP = 0;
+ int PX = 1;
+ int SP = 2;
+
+ @IntDef({PX, DP, SP})
+ @Retention(SOURCE)
+ @interface Unit {}
+}
diff --git a/core/java/android/annotation/Px.java b/core/java/android/annotation/Px.java
new file mode 100644
index 0000000..a0ef224
--- /dev/null
+++ b/core/java/android/annotation/Px.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+/**
+ * Denotes that a numeric parameter, field or method return value is expected
+ * to represent a pixel dimension.
+ *
+ * {@hide}
+ */
+@Documented
+@Retention(SOURCE)
+@Target({METHOD, PARAMETER, FIELD, LOCAL_VARIABLE})
+@Dimension(unit = Dimension.PX)
+public @interface Px {
+}
diff --git a/packages/DocumentsUI/res/layout/navigation_breadcrumb_item.xml b/packages/DocumentsUI/res/layout/navigation_breadcrumb_item.xml
index b45d25d..720f795 100644
--- a/packages/DocumentsUI/res/layout/navigation_breadcrumb_item.xml
+++ b/packages/DocumentsUI/res/layout/navigation_breadcrumb_item.xml
@@ -38,8 +38,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:paddingRight="@dimen/breadcrumb_item_padding"
- android:paddingLeft="@dimen/breadcrumb_item_padding"
android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"
android:background="@drawable/breadcrumb_item_background" />
diff --git a/packages/DocumentsUI/src/com/android/documentsui/HorizontalBreadcrumb.java b/packages/DocumentsUI/src/com/android/documentsui/HorizontalBreadcrumb.java
index e473479..7a08071 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/HorizontalBreadcrumb.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/HorizontalBreadcrumb.java
@@ -169,12 +169,16 @@
@Override
public void onBindViewHolder(BreadcrumbHolder holder, int position) {
final DocumentInfo doc = getItem(position);
+ final int horizontalPadding = (int) holder.itemView.getResources()
+ .getDimension(R.dimen.breadcrumb_item_padding);
if (position == 0) {
final RootInfo root = mEnv.getCurrentRoot();
holder.title.setText(root.title);
+ holder.title.setPadding(0, 0, horizontalPadding, 0);
} else {
holder.title.setText(doc.displayName);
+ holder.title.setPadding(horizontalPadding, 0, horizontalPadding, 0);
}
if (position == getItemCount() - 1) {