Skip to content

Commit 04a8494

Browse files
author
AWS
committed
AWS SDK for Android 2.6.1
1 parent 3876d78 commit 04a8494

File tree

56 files changed

+409
-207
lines changed

Some content is hidden

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

56 files changed

+409
-207
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log - AWS SDK for Android
22

3+
## [Release 2.6.1](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.6.1)
4+
5+
### Bug Fixes:
6+
7+
- **AWS Auth SDK**
8+
- Fixed border and shadow for Facebook and Google SignIn buttons.
9+
- Fixed the Android Support Package dependencies of the different auth clients. The Android Support Packages support-v4 and appcompat-v7 of all the auth clients now have the same version 23.0.1 and are optional dependencies. Apps consuming the auth clients will now declare the appcompat-v7 and support-v4 dependencies in the gradle manually.
10+
11+
- **Amazon Pinpoint**
12+
- Notification icon handling has been improved. By default, when the Notification icon uses the app icon, the icon will now be shown in color on Apps targeting SDK version 21 or greater. This will be achieved by setting the large icon to the app icon and generating the small icon by converting the app icon image to gray scale. For Apps targeting SDK version below 21, the behavior remains the same and the color icon is shown.
13+
314
## [Release 2.6.0](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.6.0)
415

516
### New Features:

aws-android-sdk-apigateway-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<parent>
1313
<groupId>com.amazonaws</groupId>
1414
<artifactId>aws-android-sdk-pom</artifactId>
15-
<version>2.6.0</version>
15+
<version>2.6.1</version>
1616
</parent>
1717

1818
<dependencies>
1919
<dependency>
2020
<groupId>com.amazonaws</groupId>
2121
<artifactId>aws-android-sdk-core</artifactId>
2222
<optional>false</optional>
23-
<version>2.6.0</version>
23+
<version>2.6.1</version>
2424
</dependency>
2525
</dependencies>
2626

aws-android-sdk-auth-core/pom.xml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,15 @@
2121
<parent>
2222
<groupId>com.amazonaws</groupId>
2323
<artifactId>aws-android-sdk-pom</artifactId>
24-
<version>2.6.0</version>
24+
<version>2.6.1</version>
2525
</parent>
2626

27-
<repositories>
28-
<repository>
29-
<id>android-support</id>
30-
<url>file://${env.ANDROID_HOME}/extras/android/m2repository/</url>
31-
</repository>
32-
</repositories>
33-
3427
<dependencies>
3528
<dependency>
3629
<groupId>com.amazonaws</groupId>
3730
<artifactId>aws-android-sdk-core</artifactId>
3831
<optional>false</optional>
39-
<version>2.6.0</version>
32+
<version>2.6.1</version>
4033
</dependency>
4134

4235
<dependency>
@@ -45,14 +38,6 @@
4538
<version>4.1.1.4</version>
4639
<scope>provided</scope>
4740
</dependency>
48-
49-
<dependency>
50-
<groupId>com.android.support</groupId>
51-
<artifactId>support-v4</artifactId>
52-
<version>24.2.0</version>
53-
<type>aar</type>
54-
<scope>provided</scope>
55-
</dependency>
5641
</dependencies>
5742

5843
<build>
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.amazonaws.mobile.auth.core"
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:versionCode="1"
5-
android:versionName="1.0"
6-
android:name="android.support.multidex.MultiDexApplication">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.amazonaws.mobile.auth.core">
74

8-
<application android:allowBackup="true"/>
95
</manifest>

aws-android-sdk-auth-core/src/main/java/com/amazonaws/mobile/auth/core/DefaultSignInResultHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/**
2929
* A default base class easing the work required for implementing the SignInResultHandler for
30-
* {@link IdentityManager#signInOrSignUp(Context, SignInResultHandler)} by providing default
30+
* {@link IdentityManager#setUpToAuthenticate(Context, SignInResultHandler)} by providing default
3131
* behavior in the case that the user cancels signing in or encounters an error. The default for
3232
* canceling is to toast that sign-in was canceled. The default for a sign-in error is to show
3333
* an alert dialog specifying the error message.

aws-android-sdk-auth-core/src/main/java/com/amazonaws/mobile/auth/core/signin/SignInManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import android.app.Activity;
2121
import android.content.Context;
2222
import android.content.Intent;
23-
import android.support.annotation.NonNull;
2423
import android.util.SparseArray;
2524
import android.view.View;
2625

aws-android-sdk-auth-core/src/main/java/com/amazonaws/mobile/auth/core/signin/ui/SplitBackgroundDrawable.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import android.graphics.PixelFormat;
2525
import android.graphics.Rect;
2626
import android.graphics.drawable.Drawable;
27-
import android.support.annotation.NonNull;
28-
import android.support.annotation.Nullable;
2927

3028
/**
3129
* Provides drawable for a vertically split background.
@@ -54,7 +52,7 @@ public void setSplitPointDistanceFromTop(int distanceFromTop) {
5452
}
5553

5654
@Override
57-
public void draw(@NonNull final Canvas canvas) {
55+
public void draw(final Canvas canvas) {
5856
final Rect b = getBounds();
5957
paint.setColor(this.topBackgroundColor);
6058
float y = distanceFromTopToSplitPoint < b.height() ? distanceFromTopToSplitPoint : b.height();
@@ -69,7 +67,7 @@ public void setAlpha(final int alpha) {
6967
}
7068

7169
@Override
72-
public void setColorFilter(@Nullable final ColorFilter colorFilter) {
70+
public void setColorFilter(final ColorFilter colorFilter) {
7371
}
7472

7573
@Override

aws-android-sdk-auth-core/src/main/java/com/amazonaws/mobile/auth/core/signin/ui/buttons/SignInButton.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import android.graphics.drawable.LayerDrawable;
3030
import android.graphics.drawable.ShapeDrawable;
3131
import android.graphics.drawable.StateListDrawable;
32-
import android.support.annotation.Nullable;
3332
import android.text.TextPaint;
3433
import android.text.method.TransformationMethod;
3534
import android.util.AttributeSet;
@@ -85,7 +84,7 @@ public class SignInButton extends LinearLayout {
8584
/** Boolean to keep track of whether the button should only display the image and no text. */
8685
protected boolean isSmallStyle = false;
8786

88-
public SignInButton(final Context context, @Nullable final AttributeSet attrs,
87+
public SignInButton(final Context context, final AttributeSet attrs,
8988
final int defStyleAttr, final SignInButtonAttributes buttonAttributes) {
9089
super(context, attrs, defStyleAttr);
9190
this.attributes = buttonAttributes;
@@ -167,19 +166,11 @@ private Drawable getButtonBackground(final int buttonFaceColor) {
167166
attributes.getBottomShadowColor(), attributes.getBottomShadowColor()});
168167
outerShadowBottomDrawable.setCornerRadius(dp(cornerRadius));
169168

170-
final GradientDrawable border = new GradientDrawable();
171-
border.setColor(BORDER_COLOR);
172-
border.setCornerRadius(dp(cornerRadius));
173-
174169
final LayerDrawable layerDrawable = new LayerDrawable(
175-
new Drawable[] {border,
176-
outerShadowTopDrawable,
170+
new Drawable[] {outerShadowTopDrawable,
177171
outerShadowBottomDrawable,
178172
insetBackgroundDrawable});
179173

180-
// Border for the button.
181-
layerDrawable.setLayerInset(0, 0, 0, 0, 0);
182-
183174
// Top shadow is the furthest down drawable, so it is ok if this overlaps the bottom shadow.
184175
layerDrawable.setLayerInset(1, 0, 0, 0, 0);
185176

aws-android-sdk-auth-facebook/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.amazonaws</groupId>
2323
<artifactId>aws-android-sdk-pom</artifactId>
24-
<version>2.6.0</version>
24+
<version>2.6.1</version>
2525
</parent>
2626

2727
<repositories>
@@ -36,7 +36,7 @@
3636
<groupId>com.amazonaws</groupId>
3737
<artifactId>aws-android-sdk-auth-core</artifactId>
3838
<optional>false</optional>
39-
<version>2.6.0</version>
39+
<version>2.6.1</version>
4040
<type>aar</type>
4141
</dependency>
4242
<dependency>
@@ -65,9 +65,9 @@
6565
<dependency>
6666
<groupId>com.android.support</groupId>
6767
<artifactId>support-v4</artifactId>
68-
<version>21.0.0</version>
68+
<version>23.0.1</version>
6969
<type>aar</type>
70-
<optional>false</optional>
70+
<optional>true</optional>
7171
</dependency>
7272
</dependencies>
7373

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:tools="http://schemas.android.com/tools"
45
package="com.amazonaws.mobile.auth.facebook">
56

67
<uses-permission android:name="android.permission.INTERNET" />
78
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
89
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
910

10-
<application android:allowBackup="true"
11-
android:supportsRtl="true">
11+
<application>
12+
<meta-data
13+
android:name="com.facebook.sdk.ApplicationId"
14+
android:value="@string/facebook_app_id" />
15+
16+
<activity
17+
android:name="com.facebook.FacebookActivity"
18+
android:exported="true"
19+
tools:ignore="MissingRegistered">
20+
<intent-filter>
21+
<action android:name="android.intent.action.VIEW" />
22+
23+
<category android:name="android.intent.category.DEFAULT" />
24+
<category android:name="android.intent.category.BROWSABLE" />
25+
26+
<data android:scheme="@string/facebook_login_protocol_scheme" />
27+
</intent-filter>
28+
</activity>
29+
1230
</application>
1331
</manifest>

0 commit comments

Comments
 (0)