Skip to content

Uncomment Huawei product flavor, make Cliqz as the default search engine #310

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
jayeshsolanki93 wants to merge 1 commit into
base: 1.9
Choose a base branch
from
Open

Uncomment Huawei product flavor, make Cliqz as the default search engine #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ android {
'src/cliqz/res',
]
}
// huawei {
// java.srcDirs += [
// 'src/cliqz/java',
// ]
// res.srcDirs += [
// 'src/cliqz/res',
// ]
// }
huawei {
java.srcDirs += [
'src/cliqz/java',
]
res.srcDirs += [
'src/cliqz/res',
]
}
}

flavorDimensions "api"
Expand All @@ -103,11 +103,11 @@ android {
dimension "api"
versionCode 8
}
// huawei {
// dimension "api"
// versionCode 5
// applicationIdSuffix ".huawei"
// }
huawei {
dimension "api"
versionCode 5
applicationIdSuffix ".huawei"
}
}

splits {
Expand Down Expand Up @@ -199,6 +199,7 @@ dependencies {
// On-boarding
cliqzImplementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
amazonImplementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
huaweiImplementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'

// memory leak analysis
debugImplementation 'com.gu.android:toolargetool:0.2.1@aar'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/acr/browser/lightning/constant/SearchEngines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static SearchEngines safeValueOf(String value) {
try {
return SearchEngines.valueOf(value);
} catch (IllegalArgumentException e) {
return google;
return cliqz;
}
}
public final String engineName;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public boolean getSavePasswordsEnabled() {
}

public SearchEngines getSearchChoice() {
return SearchEngines.safeValueOf(mPrefs.getString(Name.SEARCH, ""));
return SearchEngines.safeValueOf(mPrefs.getString(Name.SEARCH, "cliqz"));
}

public String getSearchUrl() {
Expand Down