Skip to content

g3ctrliu-A3 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cornelialiu wants to merge 3 commits into
base: master
Choose a base branch
from
Open

g3ctrliu-A3 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9def9bf
302 A2
cornelialiu Jan 28, 2016
e8b2085
Fixed Bug 1187382
cornelialiu Feb 26, 2016
439a542
commit patch in git version
cornelialiu Feb 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions 1187382.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
commit e8b2085482798d839f02e1fcf653b241f84dbe0e
Author: cornelialiu <cornelia.t.liu@gmail.com>
Date: Fri Feb 26 17:01:18 2016 -0600

Fixed Bug 1187382

diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
index df774bf..adb7a16 100644
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -64,8 +64,7 @@ public class AppConstants {
* If our MAX_SDK_VERSION is lower than ICS, we must not be an ICS device.
* Otherwise, we need a range check.
*/
- public static final boolean preM = MAX_SDK_VERSION < 23 ||
- (MIN_SDK_VERSION < 23 && Build.VERSION.SDK_INT < 23 && !Build.VERSION.RELEASE.equals("M"));
+ public static final boolean preMarshmallow = MAX_SDK_VERSION < 23 || (MIN_SDK_VERSION < 23 && Build.VERSION.SDK_INT < 23 );
public static final boolean preLollipop = MAX_SDK_VERSION < 21 || (MIN_SDK_VERSION < 21 && Build.VERSION.SDK_INT < 21);
public static final boolean preJBMR2 = MAX_SDK_VERSION < 18 || (MIN_SDK_VERSION < 18 && Build.VERSION.SDK_INT < 18);
public static final boolean preJBMR1 = MAX_SDK_VERSION < 17 || (MIN_SDK_VERSION < 17 && Build.VERSION.SDK_INT < 17);
diff --git a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
index 545a7ba..4ebf8af 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
@@ -25,10 +25,10 @@ public class FirstrunPagerConfig {

// The "Import" feature is disabled on devices running Android M+ (Bug 1183559).
// Exclude these users from the experiment to add an "Import" panel.
- if (isInExperimentLocal(context, ONBOARDING_A) && AppConstants.Versions.preM) {
+ if (isInExperimentLocal(context, ONBOARDING_A) && AppConstants.Versions.preMarshmallow) {
panels.add(new FirstrunPanelConfig(WelcomePanel.class.getName(), WelcomePanel.TITLE_RES));
Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING_A);
- } else if (isInExperimentLocal(context, ONBOARDING_B) && AppConstants.Versions.preM) {
+ } else if (isInExperimentLocal(context, ONBOARDING_B) && AppConstants.Versions.preMarshmallow) {
// Strings used for first run, pulled from existing strings.
panels.add(new FirstrunPanelConfig(ImportPanel.class.getName(), ImportPanel.TITLE_RES));
panels.add(new FirstrunPanelConfig(SyncPanel.class.getName(), SyncPanel.TITLE_RES));
diff --git a/mobile/android/base/java/org/mozilla/gecko/preferences/AndroidImportPreference.java b/mobile/android/base/java/org/mozilla/gecko/preferences/AndroidImportPreference.java
index 68dd86e..7e79bf7 100644
--- a/mobile/android/base/java/org/mozilla/gecko/preferences/AndroidImportPreference.java
+++ b/mobile/android/base/java/org/mozilla/gecko/preferences/AndroidImportPreference.java
@@ -28,7 +28,7 @@ class AndroidImportPreference extends MultiPrefMultiChoicePreference {
public static class Handler implements GeckoPreferences.PrefHandler {
public boolean setupPref(Context context, Preference pref) {
// Feature disabled on devices running Android M+ (Bug 1183559)
- return Versions.preM && Restrictions.isAllowed(context, Restrictable.IMPORT_SETTINGS);
+ return Versions.preMarshmallow && Restrictions.isAllowed(context, Restrictable.IMPORT_SETTINGS);
}

public void onChange(Context context, Preference pref, Object newValue) { }
1 change: 1 addition & 0 deletions browser/app/nsBrowserApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ sizeof(XPCOM_DLL) - 1))

int main(int argc, char* argv[])
{
printf("%s\n", "Hello Cornelia.");
mozilla::TimeStamp start = mozilla::TimeStamp::Now();

#ifdef XP_MACOSX
Expand Down
3 changes: 1 addition & 2 deletions mobile/android/base/AppConstants.java.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ public class AppConstants {
* If our MAX_SDK_VERSION is lower than ICS, we must not be an ICS device.
* Otherwise, we need a range check.
*/
public static final boolean preM = MAX_SDK_VERSION < 23 ||
(MIN_SDK_VERSION < 23 && Build.VERSION.SDK_INT < 23 && !Build.VERSION.RELEASE.equals("M"));
public static final boolean preMarshmallow = MAX_SDK_VERSION < 23 || (MIN_SDK_VERSION < 23 && Build.VERSION.SDK_INT < 23 );
public static final boolean preLollipop = MAX_SDK_VERSION < 21 || (MIN_SDK_VERSION < 21 && Build.VERSION.SDK_INT < 21);
public static final boolean preJBMR2 = MAX_SDK_VERSION < 18 || (MIN_SDK_VERSION < 18 && Build.VERSION.SDK_INT < 18);
public static final boolean preJBMR1 = MAX_SDK_VERSION < 17 || (MIN_SDK_VERSION < 17 && Build.VERSION.SDK_INT < 17);
Expand Down
4 changes: 2 additions & 2 deletions mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ public static List<FirstrunPanelConfig> getDefault(Context context) {

// The "Import" feature is disabled on devices running Android M+ (Bug 1183559).
// Exclude these users from the experiment to add an "Import" panel.
if (isInExperimentLocal(context, ONBOARDING_A) && AppConstants.Versions.preM) {
if (isInExperimentLocal(context, ONBOARDING_A) && AppConstants.Versions.preMarshmallow) {
panels.add(new FirstrunPanelConfig(WelcomePanel.class.getName(), WelcomePanel.TITLE_RES));
Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, ONBOARDING_A);
} else if (isInExperimentLocal(context, ONBOARDING_B) && AppConstants.Versions.preM) {
} else if (isInExperimentLocal(context, ONBOARDING_B) && AppConstants.Versions.preMarshmallow) {
// Strings used for first run, pulled from existing strings.
panels.add(new FirstrunPanelConfig(ImportPanel.class.getName(), ImportPanel.TITLE_RES));
panels.add(new FirstrunPanelConfig(SyncPanel.class.getName(), SyncPanel.TITLE_RES));
Expand Down
2 changes: 1 addition & 1 deletion mobile/android/base/java/org/mozilla/gecko/preferences/AndroidImportPreference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class AndroidImportPreference extends MultiPrefMultiChoicePreference {
public static class Handler implements GeckoPreferences.PrefHandler {
public boolean setupPref(Context context, Preference pref) {
// Feature disabled on devices running Android M+ (Bug 1183559)
return Versions.preM && Restrictions.isAllowed(context, Restrictable.IMPORT_SETTINGS);
return Versions.preMarshmallow && Restrictions.isAllowed(context, Restrictable.IMPORT_SETTINGS);
}

public void onChange(Context context, Preference pref, Object newValue) { }
Expand Down