Merge branch 'google-master'

banasiak · May 5, 2015 · e7334a8 · e7334a8
2 parents 84f69df + 30f3356
commit e7334a8
Show file tree

Hide file tree

Showing 49 changed files with 230 additions and 226 deletions.
diff --git a/AuthenticatorApp/build.gradle b/AuthenticatorApp/build.gradle
@@ -2,19 +2,36 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "22.0.0"
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
-        applicationId "com.google.android.apps.authenticator2_plus"
+        applicationId "com.google.android.apps.authenticator2"
         minSdkVersion 8
         targetSdkVersion 22
-        versionCode 4
-        versionName "2.21+4"
+        versionCode 5
+        versionName "2.21+5"
 
         testApplicationId "com.google.android.apps.authenticator2.tests"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
     }
 
+    productFlavors {
+        playStore {
+        }
+        openSource {
+            applicationId "com.google.android.apps.authenticator2.os"
+            testApplicationId "com.google.android.apps.authenticator2.tests.os"
+        }
+        openSourceDev {
+            applicationId "com.google.android.apps.authenticator2.osdev"
+            testApplicationId "com.google.android.apps.authenticator2.tests.osdev"
+        }
+        authenticatorPlus {
+            applicationId "com.google.android.apps.authenticator2.plus"
+            testApplicationId "com.google.android.apps.authenticator2.tests.plus"
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false

diff --git a/AuthenticatorApp/src/androidTest/AndroidManifest.xml b/AuthenticatorApp/src/androidTest/AndroidManifest.xml
diff --git a/...c/androidTest/java/com/google/android/apps/authenticator/AddOtherAccountActivityTest.java b/...c/androidTest/java/com/google/android/apps/authenticator/AddOtherAccountActivityTest.java
@@ -17,7 +17,7 @@
 package com.google.android.apps.authenticator;
 
 import com.google.android.apps.authenticator.testability.DependencyInjector;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.content.ComponentName;
 import android.content.Intent;

diff --git a/...ndroidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityPart2Test.java b/...ndroidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityPart2Test.java
@@ -21,7 +21,7 @@
 import com.google.android.apps.authenticator.AccountDb.OtpType;
 import com.google.android.apps.authenticator.dataimport.ImportController;
 import com.google.android.apps.authenticator.testability.DependencyInjector;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.app.Activity;
 import android.content.Intent;

diff --git a/...src/androidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityTest.java b/...src/androidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityTest.java
@@ -27,7 +27,7 @@
 import com.google.android.apps.authenticator.howitworks.IntroEnterPasswordActivity;
 import com.google.android.apps.authenticator.testability.DependencyInjector;
 import com.google.android.apps.authenticator.testability.StartActivityListener;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;

diff --git a/...App/src/androidTest/java/com/google/android/apps/authenticator/CheckCodeActivityTest.java b/...App/src/androidTest/java/com/google/android/apps/authenticator/CheckCodeActivityTest.java
@@ -18,7 +18,7 @@
 
 import com.google.android.apps.authenticator.AccountDb.OtpType;
 import com.google.android.apps.authenticator.testability.DependencyInjector;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;

diff --git a/...rApp/src/androidTest/java/com/google/android/apps/authenticator/EnterKeyActivityTest.java b/...rApp/src/androidTest/java/com/google/android/apps/authenticator/EnterKeyActivityTest.java
@@ -17,7 +17,7 @@
 package com.google.android.apps.authenticator;
 
 import com.google.android.apps.authenticator.testability.DependencyInjector;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;

diff --git a/...oogle/android/apps/authenticator/MockitoWorkaroundForEclairInstrumentationTestRunner.java b/...oogle/android/apps/authenticator/MockitoWorkaroundForEclairInstrumentationTestRunner.java
diff --git a/...src/androidTest/java/com/google/android/apps/authenticator/SettingsAboutActivityTest.java b/...src/androidTest/java/com/google/android/apps/authenticator/SettingsAboutActivityTest.java
@@ -17,7 +17,7 @@
 package com.google.android.apps.authenticator;
 
 import com.google.android.apps.authenticator.testability.DependencyInjector;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.content.Intent;
 import android.preference.Preference;

diff --git a/...nticatorApp/src/androidTest/java/com/google/android/apps/authenticator/TestUtilities.java b/...nticatorApp/src/androidTest/java/com/google/android/apps/authenticator/TestUtilities.java
@@ -22,6 +22,7 @@
 
 import com.google.android.apps.authenticator.testability.DependencyInjector;
 import com.google.android.apps.authenticator.testability.StartActivityListener;
+import com.google.android.apps.authenticator2.BuildConfig;
 
 import android.app.Activity;
 import android.app.Instrumentation;
@@ -66,7 +67,7 @@
  */
 public class TestUtilities {
 
-  public static final String APP_PACKAGE_NAME = "com.google.android.apps.authenticator2";
+  public static final String APP_PACKAGE_NAME = BuildConfig.APPLICATION_ID;
 
   /**
    * Timeout (milliseconds) when waiting for the results of a UI action performed by the code

diff --git a/...androidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTest.java b/...androidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTest.java
@@ -22,7 +22,7 @@
 import com.google.android.apps.authenticator.AuthenticatorActivity;
 import com.google.android.apps.authenticator.TestUtilities;
 import com.google.android.apps.authenticator.testability.DependencyInjector;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.content.ComponentName;
 import android.content.Intent;

diff --git a/...oidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTestBase.java b/...oidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTestBase.java
@@ -18,7 +18,7 @@
 
 import com.google.android.apps.authenticator.TestUtilities;
 import com.google.android.apps.authenticator.testability.DependencyInjector;
-import com.google.android.apps.authenticator2_plus.R;
+import com.google.android.apps.authenticator2.R;
 
 import android.content.ComponentName;
 import android.content.Intent;

diff --git a/AuthenticatorApp/src/authenticatorPlus/res/values/strings.xml b/AuthenticatorApp/src/authenticatorPlus/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2009 Google Inc. All Rights Reserved.
+
+     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.
+-->
+
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- The package of the application flavor, for use within preferences, etc. -->
+    <string name="app_package_name" translatable="false">com.google.android.apps.authenticator2.plus</string>
+
+</resources>
diff --git a/AuthenticatorApp/src/main/AndroidManifest.xml b/AuthenticatorApp/src/main/AndroidManifest.xml
@@ -16,78 +16,77 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.android.apps.authenticator2_plus">
-
-
-  <uses-permission android:name="android.permission.VIBRATE" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
-  <!--
-  NOTE: android:allowBackup is set to false below to prevent the key material from being extracted
-  from the device using various backup methods (e.g., adb backup introduced in ICS).
-  -->
-  <application android:label="@string/app_name_short"
-               android:icon="@drawable/ic_launcher"
-               android:theme="@style/AuthenticatorTheme"
-               android:name="com.google.android.apps.authenticator.AuthenticatorApplication"
-               android:allowBackup="false">
-
-    <activity android:name="com.google.android.apps.authenticator.AuthenticatorActivity"
-              android:label="@string/app_name_short"
-              android:launchMode="singleTask">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="otpauth" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.authenticator.SettingsAboutActivity"
-              android:label="@string/about_preference_screen_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.AddOtherAccountActivity"
-              android:label="@string/add_account_menu_item" />
-
-    <activity android:name="com.google.android.apps.authenticator.EnterKeyActivity"
-              android:label="@string/enter_key_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.CheckCodeActivity"
-              android:label="@string/check_code_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.SettingsActivity"
-              android:label="@string/main_preference_screen_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.howitworks.IntroEnterPasswordActivity"
-              android:theme="@style/AuthenticatorTheme.NoTitleBar"
-              android:label="@string/howitworks_page_enter_password_title" />
-    <activity android:name="com.google.android.apps.authenticator.howitworks.IntroEnterCodeActivity"
-              android:theme="@style/AuthenticatorTheme.NoTitleBar"
-              android:label="@string/howitworks_page_enter_code_title" />
-    <activity android:name="com.google.android.apps.authenticator.howitworks.IntroVerifyDeviceActivity"
-              android:theme="@style/AuthenticatorTheme.NoTitleBar"
-              android:label="@string/howitworks_page_verify_device_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.timesync.SettingsTimeCorrectionActivity"
-              android:label="@string/timesync_preference_screen_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.timesync.AboutActivity"
-              android:theme="@style/AuthenticatorTheme.NoTitleBar"
-              android:label="@string/timesync_about_feature_screen_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.timesync.SyncNowActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:label="@string/timesync_sync_now_screen_title" />
-
-    <activity android:name="com.google.android.apps.authenticator.backup.BackupActivity"
-              android:label="@string/backup_screen_title" />
-
-  </application>
-
-</manifest>
+    package="com.google.android.apps.authenticator2">
+
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+    <!--
+    NOTE: android:allowBackup is set to false below to prevent the key material from being extracted
+    from the device using various backup methods (e.g., adb backup introduced in ICS).
+    -->
+    <application android:label="@string/app_name_short"
+        android:icon="@drawable/ic_launcher_authenticator"
+        android:theme="@style/AuthenticatorTheme"
+        android:name="com.google.android.apps.authenticator.AuthenticatorApplication"
+        android:allowBackup="false">
+
+        <activity android:name="com.google.android.apps.authenticator.AuthenticatorActivity"
+            android:label="@string/app_name_short"
+            android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="otpauth" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.google.android.apps.authenticator.SettingsAboutActivity"
+            android:label="@string/about_preference_screen_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.AddOtherAccountActivity"
+            android:label="@string/add_account_menu_item" />
+
+        <activity android:name="com.google.android.apps.authenticator.EnterKeyActivity"
+            android:label="@string/enter_key_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.CheckCodeActivity"
+            android:label="@string/check_code_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.SettingsActivity"
+            android:label="@string/main_preference_screen_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.howitworks.IntroEnterPasswordActivity"
+            android:theme="@style/AuthenticatorTheme.NoTitleBar"
+            android:label="@string/howitworks_page_enter_password_title" />
+        <activity android:name="com.google.android.apps.authenticator.howitworks.IntroEnterCodeActivity"
+            android:theme="@style/AuthenticatorTheme.NoTitleBar"
+            android:label="@string/howitworks_page_enter_code_title" />
+        <activity android:name="com.google.android.apps.authenticator.howitworks.IntroVerifyDeviceActivity"
+            android:theme="@style/AuthenticatorTheme.NoTitleBar"
+            android:label="@string/howitworks_page_verify_device_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.timesync.SettingsTimeCorrectionActivity"
+            android:label="@string/timesync_preference_screen_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.timesync.AboutActivity"
+            android:theme="@style/AuthenticatorTheme.NoTitleBar"
+            android:label="@string/timesync_about_feature_screen_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.timesync.SyncNowActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:label="@string/timesync_sync_now_screen_title" />
+
+        <activity android:name="com.google.android.apps.authenticator.backup.BackupActivity"
+            android:label="@string/backup_screen_title" />
+
+    </application>
+
+</manifest>