summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorSetup Wizard Team <android-setup-team-eng@google.com>2019-05-20 10:55:33 +0800
committerNicole Huang <nicolehuang@google.com>2019-05-20 03:49:23 +0000
commitd18b2a23c103f7dae8bc0e8df6d51ac998f722c7 (patch)
tree7b0e94e2fe046d2c278ac68d400cfcb959a37e64 /main/src
parent2eb34e37de612f57f2609c8ab78e8e4e929bf313 (diff)
downloadsetupdesign-d18b2a23c103f7dae8bc0e8df6d51ac998f722c7.tar.gz
Import updated Android Setupdesign Library 248976877android10-dev
Copied from google3/third_party/java_src/android_libs/setupdesign Bug: 132311066 Test: mm Included changes: - 248976877 access partner resource event the partner package is disa... - 248651729 Fix icon position in google service page. - 248218475 Update GLIF dark theme colors PiperOrigin-RevId: 248976877 Change-Id: I450cd1ca66ec3741ddad98402b35ebded41e246b
Diffstat (limited to 'main/src')
-rw-r--r--main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java3
-rw-r--r--main/src/com/google/android/setupdesign/items/Item.java4
-rw-r--r--main/src/com/google/android/setupdesign/util/Partner.java5
3 files changed, 8 insertions, 4 deletions
diff --git a/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java b/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java
index 1e0551b..28b41c9 100644
--- a/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java
+++ b/main/src/com/google/android/setupdesign/items/ExpandableSwitchItem.java
@@ -28,6 +28,7 @@ import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
import android.util.AttributeSet;
+import android.view.Gravity;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -67,6 +68,7 @@ public class ExpandableSwitchItem extends SwitchItem
public ExpandableSwitchItem() {
super();
+ setIconGravity(Gravity.TOP);
}
public ExpandableSwitchItem(Context context, AttributeSet attrs) {
@@ -74,6 +76,7 @@ public class ExpandableSwitchItem extends SwitchItem
final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudExpandableSwitchItem);
collapsedSummary = a.getText(R.styleable.SudExpandableSwitchItem_sudCollapsedSummary);
expandedSummary = a.getText(R.styleable.SudExpandableSwitchItem_sudExpandedSummary);
+ setIconGravity(a.getInt(R.styleable.SudItem_sudIconGravity, Gravity.TOP));
a.recycle();
}
diff --git a/main/src/com/google/android/setupdesign/items/Item.java b/main/src/com/google/android/setupdesign/items/Item.java
index 7aa6297..6f0cea3 100644
--- a/main/src/com/google/android/setupdesign/items/Item.java
+++ b/main/src/com/google/android/setupdesign/items/Item.java
@@ -43,7 +43,7 @@ public class Item extends AbstractItem {
private CharSequence title;
private boolean visible = true;
@ColorInt private int iconTint = Color.TRANSPARENT;
- private int iconGravity = Gravity.CENTER;
+ private int iconGravity = Gravity.CENTER_VERTICAL;
public Item() {
super();
@@ -60,7 +60,7 @@ public class Item extends AbstractItem {
layoutRes = a.getResourceId(R.styleable.SudItem_android_layout, getDefaultLayoutResource());
visible = a.getBoolean(R.styleable.SudItem_android_visible, true);
iconTint = a.getColor(R.styleable.SudItem_sudIconTint, Color.TRANSPARENT);
- iconGravity = a.getInt(R.styleable.SudItem_sudIconGravity, Gravity.CENTER);
+ iconGravity = a.getInt(R.styleable.SudItem_sudIconGravity, Gravity.CENTER_VERTICAL);
a.recycle();
}
diff --git a/main/src/com/google/android/setupdesign/util/Partner.java b/main/src/com/google/android/setupdesign/util/Partner.java
index b35237c..6b97bf6 100644
--- a/main/src/com/google/android/setupdesign/util/Partner.java
+++ b/main/src/com/google/android/setupdesign/util/Partner.java
@@ -147,11 +147,12 @@ public class Partner {
intent,
PackageManager.MATCH_SYSTEM_ONLY
| PackageManager.MATCH_DIRECT_BOOT_AWARE
- | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_DISABLED_COMPONENTS);
} else {
// On versions before N, direct boot doesn't exist. And the MATCH_SYSTEM_ONLY flag
// doesn't exist so we filter for system apps in code below.
- receivers = pm.queryBroadcastReceivers(intent, 0);
+ receivers = pm.queryBroadcastReceivers(intent, PackageManager.GET_DISABLED_COMPONENTS);
}
for (ResolveInfo info : receivers) {