Skip to content
This repository was archived by the owner on Sep 23, 2022. It is now read-only.

Commit ec51d3a

Browse files
committed
Sync: android-8.1.0_r18
1 parent 527df64 commit ec51d3a

File tree

109 files changed

+1322
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1322
-158
lines changed

build.gradle

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.0.0-beta3'
7+
classpath 'com.android.tools.build:gradle:3.0.1'
88
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
99
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1010
}
@@ -22,16 +22,14 @@ task clean(type: Delete) {
2222
}
2323

2424
ext {
25-
COMPILE_SDK_VERSION = 26
26-
BUILD_TOOLS_VERSION = "26.0.1"
27-
TARGET_SDK_VERSION = COMPILE_SDK_VERSION
25+
COMPILE_SDK_VERSION = 27
2826
VERSION_CODE = getVersionCode()
2927
VERSION_NAME = getVersionName()
3028

31-
ANDROID_SUPPORT_LIBRARY_VERSION = "26.0.0"
29+
ANDROID_SUPPORT_LIBRARY_VERSION = "27.1.0"
3230

3331
setupwizardlib = [
34-
MIN_SDK_VERSION: 19
32+
MIN_SDK_VERSION: 23
3533
]
3634

3735
setupwizardlibcompat = [
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

eclair-mr1/res/drawable/suw_ic_expand_less.xml renamed to gingerbread/res/drawable/suw_ic_expand_less.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
-->
1717

1818
<vector xmlns:android="http://schemas.android.com/apk/res/android"
19-
android:width="18dp"
20-
android:height="18dp"
21-
android:viewportHeight="24.0"
22-
android:viewportWidth="24.0">
19+
android:width="20dp"
20+
android:height="24dp"
21+
android:viewportWidth="20.0"
22+
android:viewportHeight="24.0">
23+
2324
<path
2425
android:fillColor="#ff000000"
25-
android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" />
26+
android:pathData="M10,9.17l-5,5 1.18,1.18L10,11.53l3.83,3.82L15,14.17z" />
27+
2628
</vector>

eclair-mr1/res/drawable/suw_ic_expand_more.xml renamed to gingerbread/res/drawable/suw_ic_expand_more.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
-->
1717

1818
<vector xmlns:android="http://schemas.android.com/apk/res/android"
19-
android:width="18dp"
20-
android:height="18dp"
21-
android:viewportWidth="24.0"
19+
android:width="20dp"
20+
android:height="24dp"
21+
android:viewportWidth="20.0"
2222
android:viewportHeight="24.0">
23+
2324
<path
2425
android:fillColor="#ff000000"
25-
android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
26+
android:pathData="M13.83,9.66L10,13.48 6.18,9.66 5,10.83l5,5 5,-5z"/>
27+
2628
</vector>

eclair-mr1/res/layout/suw_items_expandable_switch.xml renamed to gingerbread/res/layout/suw_items_expandable_switch.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,17 @@
9494
android:id="@+id/suw_items_switch_divider"
9595
android:layout_width="1dp"
9696
android:layout_height="@dimen/suw_switch_divider_height"
97-
android:layout_gravity="center_vertical"
97+
android:layout_gravity="top"
98+
android:layout_marginTop="@dimen/suw_switch_divider_padding_top"
9899
android:background="?android:attr/listDivider" />
99100

100101
<android.support.v7.widget.SwitchCompat
101102
android:id="@+id/suw_items_switch"
102103
style="@style/SuwSwitchStyle.Divided"
103104
android:layout_width="wrap_content"
104105
android:layout_height="match_parent"
105-
android:layout_gravity="center_vertical" />
106+
android:layout_gravity="top"
107+
android:gravity="top"
108+
android:paddingTop="@dimen/suw_switch_padding_top" />
106109

107110
</LinearLayout>
File renamed without changes.

eclair-mr1/res/values/dimens.xml renamed to gingerbread/res/values/dimens.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
<!-- SwitchItem -->
2121
<dimen name="suw_switch_padding_start">16dp</dimen>
2222
<dimen name="suw_switch_padding_end">0dp</dimen>
23+
<dimen name="suw_switch_padding_top">39dp</dimen>
2324
<dimen name="suw_switch_divider_height">32dp</dimen>
25+
<dimen name="suw_switch_divider_padding_top">36dp</dimen>
2426
<dimen name="suw_switch_content_padding_end">16dp</dimen>
2527

2628
<!-- ExpandableSwithItem -->
27-
<dimen name="suw_expand_arrow_drawable_padding">6dp</dimen>
29+
<dimen name="suw_expand_arrow_drawable_padding">4dp</dimen>
2830

2931
</resources>

eclair-mr1/res/values/styles.xml renamed to gingerbread/res/values/styles.xml

+28-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
2525
<item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>
2626
<item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item>
27+
<item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/suwMarginSides</item>
28+
<item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/suwMarginSides</item>
2729
<item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item>
2830
<item name="android:statusBarColor" tools:ignore="NewApi">@android:color/black</item>
2931
<item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item>
@@ -33,10 +35,15 @@
3335
<item name="android:windowSoftInputMode">adjustResize</item>
3436

3537
<item name="colorAccent">@color/suw_color_accent_dark</item>
38+
<item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
3639
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
3740
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
3841
<item name="suwCardBackground">@drawable/suw_card_bg_dark</item>
42+
<item name="suwDividerInsetEnd">0dp</item>
43+
<item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
44+
<item name="suwDividerInsetStartNoIcon">@dimen/suw_items_text_divider_inset</item>
3945
<item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</item>
46+
<item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle</item>
4047
<item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item>
4148
<item name="suwMarginSides">@dimen/suw_layout_margin_sides</item>
4249
<item name="suwNavBarTheme">@style/SuwNavBarThemeDark</item>
@@ -48,6 +55,8 @@
4855
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
4956
<item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>
5057
<item name="android:listPreferredItemHeight">@dimen/suw_items_preferred_height</item>
58+
<item name="android:listPreferredItemPaddingEnd" tools:ignore="NewApi">?attr/suwMarginSides</item>
59+
<item name="android:listPreferredItemPaddingStart" tools:ignore="NewApi">?attr/suwMarginSides</item>
5160
<item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item>
5261
<item name="android:statusBarColor" tools:ignore="NewApi">@android:color/black</item>
5362
<item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item>
@@ -57,17 +66,23 @@
5766
<item name="android:windowSoftInputMode">adjustResize</item>
5867

5968
<item name="colorAccent">@color/suw_color_accent_light</item>
69+
<item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
6070
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
6171
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
6272
<item name="suwCardBackground">@drawable/suw_card_bg_light</item>
73+
<item name="suwDividerInsetEnd">0dp</item>
74+
<item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item>
75+
<item name="suwDividerInsetStartNoIcon">@dimen/suw_items_text_divider_inset</item>
6376
<item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description</item>
77+
<item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle</item>
6478
<item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item>
6579
<item name="suwMarginSides">@dimen/suw_layout_margin_sides</item>
6680
<item name="suwNavBarTheme">@style/SuwNavBarThemeLight</item>
6781
<item name="textAppearanceListItemSmall">@style/TextAppearance.SuwItemSummary</item>
6882
</style>
6983

7084
<style name="SuwThemeGlif" parent="Theme.AppCompat.NoActionBar">
85+
<item name="android:colorBackground">@color/suw_glif_background_color_dark</item>
7186
<item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item>
7287
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
7388
<item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>
@@ -77,7 +92,7 @@
7792
<item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item>
7893
<item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item>
7994
<item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item>
80-
<item name="android:textColorLink">@color/suw_link_color_dark</item>
95+
<item name="android:textColorLink">@color/suw_color_accent_glif_dark</item>
8196
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
8297
<item name="android:windowDisablePreview">true</item>
8398
<item name="android:windowSoftInputMode">adjustResize</item>
@@ -87,9 +102,13 @@
87102
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
88103
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
89104
<item name="suwColorPrimary">?attr/colorPrimary</item>
90-
<item name="suwDividerInset">@dimen/suw_items_glif_icon_divider_inset</item>
105+
<item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
106+
<item name="suwDividerInsetEnd">0dp</item>
107+
<item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
108+
<item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
91109
<item name="suwGlifHeaderGravity">start</item>
92110
<item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
111+
<item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>
93112
<item name="suwListItemIconColor">@color/suw_list_item_icon_color_dark</item>
94113
<item name="suwMarginSides">@dimen/suw_glif_margin_sides</item>
95114
<item name="suwScrollIndicators">bottom</item>
@@ -98,6 +117,7 @@
98117
</style>
99118

100119
<style name="SuwThemeGlif.Light" parent="Theme.AppCompat.Light.NoActionBar">
120+
<item name="android:colorBackground">@color/suw_glif_background_color_light</item>
101121
<item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item>
102122
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
103123
<item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>
@@ -107,7 +127,7 @@
107127
<item name="android:navigationBarColor" tools:ignore="NewApi">@android:color/black</item>
108128
<item name="android:statusBarColor" tools:ignore="NewApi">@android:color/transparent</item>
109129
<item name="android:textAppearanceListItemSmall" tools:ignore="NewApi">?attr/textAppearanceListItemSmall</item>
110-
<item name="android:textColorLink">@color/suw_link_color_light</item>
130+
<item name="android:textColorLink">@color/suw_color_accent_glif_light</item>
111131
<item name="android:windowAnimationStyle">@style/Animation.SuwWindowAnimation</item>
112132
<item name="android:windowDisablePreview">true</item>
113133
<item name="android:windowSoftInputMode">adjustResize</item>
@@ -117,9 +137,13 @@
117137
<item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item>
118138
<item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item>
119139
<item name="suwColorPrimary">?attr/colorPrimary</item>
120-
<item name="suwDividerInset">@dimen/suw_items_glif_icon_divider_inset</item>
140+
<item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item>
141+
<item name="suwDividerInsetEnd">0dp</item>
142+
<item name="suwDividerInsetStart">@dimen/suw_items_glif_icon_divider_inset</item>
143+
<item name="suwDividerInsetStartNoIcon">@dimen/suw_items_glif_text_divider_inset</item>
121144
<item name="suwGlifHeaderGravity">start</item>
122145
<item name="suwItemDescriptionStyle">@style/SuwItemContainer.Description.Glif</item>
146+
<item name="suwItemDescriptionTitleStyle">@style/SuwItemTitle.GlifDescription</item>
123147
<item name="suwListItemIconColor">@color/suw_list_item_icon_color_light</item>
124148
<item name="suwMarginSides">@dimen/suw_glif_margin_sides</item>
125149
<item name="suwScrollIndicators">bottom</item>
@@ -176,7 +200,6 @@
176200
<item name="buttonStyle">@style/SuwGlifButton.Primary</item>
177201

178202
<!-- Values used in styles -->
179-
<item name="android:minWidth">0dp</item>
180203
<item name="android:paddingLeft">@dimen/suw_glif_button_padding</item>
181204
<item name="android:paddingRight">@dimen/suw_glif_button_padding</item>
182205
</style>

eclair-mr1/src/com/android/setupwizardlib/items/SwitchItem.java renamed to gingerbread/src/com/android/setupwizardlib/items/SwitchItem.java

+28
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,45 @@
3333
*/
3434
public class SwitchItem extends Item implements CompoundButton.OnCheckedChangeListener {
3535

36+
/**
37+
* Listener for check state changes of this switch item.
38+
*/
3639
public interface OnCheckedChangeListener {
40+
41+
/**
42+
* Callback when checked state of a {@link SwitchItem} is changed.
43+
*
44+
* @see #setOnCheckedChangeListener(OnCheckedChangeListener)
45+
*/
3746
void onCheckedChange(SwitchItem item, boolean isChecked);
3847
}
3948

4049
private boolean mChecked = false;
4150
private OnCheckedChangeListener mListener;
4251

52+
/**
53+
* Creates a default switch item.
54+
*/
4355
public SwitchItem() {
4456
super();
4557
}
4658

59+
/**
60+
* Creates a switch item. This constructor is used for inflation from XML.
61+
*
62+
* @param context The context which this item is inflated in.
63+
* @param attrs The XML attributes defined on the item.
64+
*/
4765
public SwitchItem(Context context, AttributeSet attrs) {
4866
super(context, attrs);
4967
final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SuwSwitchItem);
5068
mChecked = a.getBoolean(R.styleable.SuwSwitchItem_android_checked, false);
5169
a.recycle();
5270
}
5371

72+
/**
73+
* Sets whether this item should be checked.
74+
*/
5475
public void setChecked(boolean checked) {
5576
if (mChecked != checked) {
5677
mChecked = checked;
@@ -61,6 +82,9 @@ public void setChecked(boolean checked) {
6182
}
6283
}
6384

85+
/**
86+
* @return True if this switch item is currently checked.
87+
*/
6488
public boolean isChecked() {
6589
return mChecked;
6690
}
@@ -91,6 +115,10 @@ public void onBindView(View view) {
91115
switchView.setEnabled(isEnabled());
92116
}
93117

118+
/**
119+
* Sets a listener to listen for changes in checked state. This listener is invoked in both
120+
* user toggling the switch and calls to {@link #setChecked(boolean)}.
121+
*/
94122
public void setOnCheckedChangeListener(OnCheckedChangeListener listener) {
95123
mListener = listener;
96124
}

eclair-mr1/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java renamed to gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
package com.android.setupwizardlib.util;
1818

19-
import static android.support.v4.os.BuildCompat.isAtLeastO;
20-
2119
import android.graphics.Rect;
20+
import android.os.Build;
2221
import android.os.Bundle;
2322
import android.support.v4.view.AccessibilityDelegateCompat;
2423
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
@@ -74,7 +73,7 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat {
7473
private final ExploreByTouchHelper mExploreByTouchHelper;
7574

7675
public LinkAccessibilityHelper(TextView view) {
77-
if (!isAtLeastO()) {
76+
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1) {
7877
// Pre-O, we essentially extend ExploreByTouchHelper to expose a virtual view hierarchy
7978
mExploreByTouchHelper = new ExploreByTouchHelper(view) {
8079
@Override
@@ -90,15 +89,15 @@ protected void getVisibleVirtualViews(List<Integer> virtualViewIds) {
9089
@Override
9190
protected void onPopulateEventForVirtualView(int virtualViewId,
9291
AccessibilityEvent event) {
93-
LinkAccessibilityHelper.this
94-
.onPopulateEventForVirtualView(virtualViewId, event);
92+
LinkAccessibilityHelper
93+
.this.onPopulateEventForVirtualView(virtualViewId, event);
9594
}
9695

9796
@Override
9897
protected void onPopulateNodeForVirtualView(int virtualViewId,
9998
AccessibilityNodeInfoCompat infoCompat) {
100-
LinkAccessibilityHelper.this
101-
.onPopulateNodeForVirtualView(virtualViewId, infoCompat);
99+
LinkAccessibilityHelper
100+
.this.onPopulateNodeForVirtualView(virtualViewId, infoCompat);
102101

103102
}
104103

eclair-mr1/src/com/android/setupwizardlib/view/NavigationBarButton.java renamed to gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
import android.util.AttributeSet;
2727
import android.widget.Button;
2828

29+
/**
30+
* Button for navigation bar, which includes tinting of its compound drawables to be used for dark
31+
* and light themes.
32+
*/
2933
public class NavigationBarButton extends Button {
3034

3135
public NavigationBarButton(Context context) {
@@ -120,7 +124,7 @@ public static TintedDrawable wrap(Drawable drawable) {
120124

121125
private ColorStateList mTintList = null;
122126

123-
public TintedDrawable(Drawable wrapped) {
127+
TintedDrawable(Drawable wrapped) {
124128
super(new Drawable[] { wrapped });
125129
}
126130

0 commit comments

Comments
 (0)