From d9fc9adf221d014798cc64d4d1bc8196e3afa43a Mon Sep 17 00:00:00 2001 From: Dmitry Dementyev Date: Fri, 2 Dec 2016 14:09:27 -0800 Subject: [PATCH] Temporary remove account visibility support pushapiauthenticator. Refactor push api test apps to have more similar code and use another manifest entry. Bug: https://b.corp.google.com/issues/33046496 Test: none Change-Id: I2c87ccae0e73892eb15fb3e6f98bbb7372e0a24a --- .../pushapiauthenticator/MainActivity.java | 5 +- apps/PushApiTestAppOne/AndroidManifest.xml | 4 +- .../res/layout/activity_main.xml | 6 +- .../pushapithirdpartyone/MainActivity.java | 4 +- .../pushapithirdpartyone/MessageReceiver.java | 11 +- apps/PushApiTestAppTwo/AndroidManifest.xml | 8 +- .../res/layout/activity_main.xml | 124 ++++++++---------- .../pushapithirdpartytwo/MainActivity.java | 10 +- .../pushapithirdpartytwo/MessageReceiver.java | 9 +- 9 files changed, 88 insertions(+), 93 deletions(-) diff --git a/apps/PushApiAuthenticator/src/com/example/android/pushapiauthenticator/MainActivity.java b/apps/PushApiAuthenticator/src/com/example/android/pushapiauthenticator/MainActivity.java index 2d547e92f..9f7b55a41 100644 --- a/apps/PushApiAuthenticator/src/com/example/android/pushapiauthenticator/MainActivity.java +++ b/apps/PushApiAuthenticator/src/com/example/android/pushapiauthenticator/MainActivity.java @@ -132,6 +132,8 @@ public class MainActivity extends Activity { selectOption.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + //TODO update Authenticator once AccountManager API is updated + /* Account currentAccount = terraAccount; int checkedAccount = accountChooser.getCheckedRadioButtonId(); int checkedOption = optionChooser.getCheckedRadioButtonId(); @@ -211,7 +213,8 @@ public class MainActivity extends Activity { authStatus.setText("----"); } } + */ } }); } -} \ No newline at end of file +} diff --git a/apps/PushApiTestAppOne/AndroidManifest.xml b/apps/PushApiTestAppOne/AndroidManifest.xml index 3999fdc57..54be509d3 100644 --- a/apps/PushApiTestAppOne/AndroidManifest.xml +++ b/apps/PushApiTestAppOne/AndroidManifest.xml @@ -31,7 +31,7 @@ - \ No newline at end of file + diff --git a/apps/PushApiTestAppOne/res/layout/activity_main.xml b/apps/PushApiTestAppOne/res/layout/activity_main.xml index 952e35352..30273e446 100644 --- a/apps/PushApiTestAppOne/res/layout/activity_main.xml +++ b/apps/PushApiTestAppOne/res/layout/activity_main.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:text="Test Application One" - android:id="@+id/testapponetext" + android:id="@+id/testapptext" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:layout_marginTop="27dp" /> @@ -44,7 +44,7 @@ android:text="Visible Accounts" android:id="@+id/visibleaccountstext" android:layout_marginTop="58dp" - android:layout_below="@+id/testapponetext" + android:layout_below="@+id/testapptext" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> @@ -89,4 +89,4 @@ - \ No newline at end of file + diff --git a/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MainActivity.java b/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MainActivity.java index 7513f0b9a..d9ddcaafd 100644 --- a/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MainActivity.java +++ b/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MainActivity.java @@ -72,7 +72,7 @@ public class MainActivity extends Activity { ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA); Bundle bundle = ai.metaData; - supportedPackages = bundle.getString("android.accounts.SupportedLoginTypes"); + supportedPackages = bundle.getString("android.accounts.SupportedAccountTypes"); } catch (PackageManager.NameNotFoundException e) { Log.e("PushApiTestAppOne", "Failed to load meta-data, NameNotFound: " + e.getMessage()); @@ -109,4 +109,4 @@ public class MainActivity extends Activity { } }); } -} \ No newline at end of file +} diff --git a/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MessageReceiver.java b/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MessageReceiver.java index 21951f322..754c3d84b 100644 --- a/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MessageReceiver.java +++ b/apps/PushApiTestAppOne/src/com/example/android/pushapithirdpartyone/MessageReceiver.java @@ -14,18 +14,21 @@ * limitations under the License. */ -package com.example.android.pushapithirdpartyone; +package com.example.android.pushapithirdpartytwo; import android.accounts.Account; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.util.Log; import android.widget.Toast; public class MessageReceiver extends BroadcastReceiver{ + private static final String TAG = "PushApiTestAppOne"; + public void onReceive(Context context, Intent intent) { - Account account = (Account) intent.getParcelableExtra("android.accounts.KEY_ACCOUNT"); - Toast.makeText(context, "Account " + account.name + " received by Test App 1", + Toast.makeText(context, " android.accounts.VISIBLE_ACCOUNTS_CHANGED Broadcast received", Toast.LENGTH_LONG).show(); + Log.i(TAG, "android.accounts.VISIBLE_ACCOUNTS_CHANGED Broadcast received"); } -} \ No newline at end of file +} diff --git a/apps/PushApiTestAppTwo/AndroidManifest.xml b/apps/PushApiTestAppTwo/AndroidManifest.xml index 7f1d000cf..8ff970da4 100644 --- a/apps/PushApiTestAppTwo/AndroidManifest.xml +++ b/apps/PushApiTestAppTwo/AndroidManifest.xml @@ -17,7 +17,7 @@ - + @@ -27,11 +27,11 @@ - + - \ No newline at end of file + diff --git a/apps/PushApiTestAppTwo/res/layout/activity_main.xml b/apps/PushApiTestAppTwo/res/layout/activity_main.xml index 23d3fe848..fe91a9015 100644 --- a/apps/PushApiTestAppTwo/res/layout/activity_main.xml +++ b/apps/PushApiTestAppTwo/res/layout/activity_main.xml @@ -18,88 +18,74 @@ - - - - - - - - - - -