author | Allison Naaktgeboren <ally@mozilla.com> |
Fri, 07 Aug 2015 21:41:32 -0700 | |
changeset 256942 | bd1474381abd27e9a47549d9001c1bc9bd2c24c6 |
parent 256941 | b8f3ee0be9aa26109f033da417797589e6634029 |
child 256943 | 7bbb28b68b0dbd8d067ed71c8c4017cd50b5dbaa |
push id | 29195 |
push user | philringnalda@gmail.com |
push date | Sun, 09 Aug 2015 01:37:55 +0000 |
treeherder | mozilla-central@fd63d8ed9d2e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | sebastian |
bugs | 1125280 |
milestone | 42.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/RestrictedProfiles.java +++ b/mobile/android/base/RestrictedProfiles.java @@ -50,17 +50,17 @@ public class RestrictedProfiles { } } private static boolean isGuestProfile() { return GeckoAppShell.getGeckoInterface().getProfile().inGuestMode(); } @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) - private static boolean isRestrictedProfile(Context context) { + public static boolean isRestrictedProfile(Context context) { if (Versions.preJBMR2) { // Early versions don't support restrictions at all return false; } final UserManager mgr = (UserManager) context.getSystemService(Context.USER_SERVICE); final Bundle restrictions = new Bundle(); restrictions.putAll(mgr.getApplicationRestrictions(context.getPackageName()));
--- a/mobile/android/base/db/SuggestedSites.java +++ b/mobile/android/base/db/SuggestedSites.java @@ -35,16 +35,17 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.mozilla.gecko.GeckoSharedPrefs; import org.mozilla.gecko.GeckoProfile; import org.mozilla.gecko.Locales; import org.mozilla.gecko.R; import org.mozilla.gecko.distribution.Distribution; import org.mozilla.gecko.db.BrowserContract; +import org.mozilla.gecko.RestrictedProfiles; import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.RawResource; import org.mozilla.gecko.util.ThreadUtils; /** * {@code SuggestedSites} provides API to get a list of locale-specific * suggested sites to be used in Fennec's top sites panel. It provides @@ -85,40 +86,44 @@ public class SuggestedSites { public static final int TRACKING_ID_NONE = -1; private static final String JSON_KEY_TRACKING_ID = "trackingid"; private static final String JSON_KEY_URL = "url"; private static final String JSON_KEY_TITLE = "title"; private static final String JSON_KEY_IMAGE_URL = "imageurl"; private static final String JSON_KEY_BG_COLOR = "bgcolor"; + private static final String JSON_KEY_RESTRICTED = "restricted"; private static class Site { public final String url; public final String title; public final String imageUrl; public final String bgColor; public final int trackingId; + public final boolean restricted; public Site(JSONObject json) throws JSONException { this.trackingId = json.isNull(JSON_KEY_TRACKING_ID) ? TRACKING_ID_NONE : json.getInt(JSON_KEY_TRACKING_ID); + this.restricted = !json.isNull(JSON_KEY_RESTRICTED); this.url = json.getString(JSON_KEY_URL); this.title = json.getString(JSON_KEY_TITLE); this.imageUrl = json.getString(JSON_KEY_IMAGE_URL); this.bgColor = json.getString(JSON_KEY_BG_COLOR); validate(); } public Site(int trackingId, String url, String title, String imageUrl, String bgColor) { this.trackingId = trackingId; this.url = url; this.title = title; this.imageUrl = imageUrl; this.bgColor = bgColor; + this.restricted = false; validate(); } private void validate() { // Site instances must have non-empty values for all properties except IDs. if (TextUtils.isEmpty(url) || TextUtils.isEmpty(title) || @@ -128,28 +133,33 @@ public class SuggestedSites { "image URL, and background color."); } } @Override public String toString() { return "{ trackingId = " + trackingId + "\n" + "url = " + url + "\n" + + "restricted = " + restricted + "\n" + "title = " + title + "\n" + "imageUrl = " + imageUrl + "\n" + "bgColor = " + bgColor + " }"; } public JSONObject toJSON() throws JSONException { final JSONObject json = new JSONObject(); if (trackingId >= 0) { json.put(JSON_KEY_TRACKING_ID, trackingId); } + if (restricted) { + json.put(JSON_KEY_RESTRICTED, true); + } + json.put(JSON_KEY_URL, url); json.put(JSON_KEY_TITLE, title); json.put(JSON_KEY_IMAGE_URL, imageUrl); json.put(JSON_KEY_BG_COLOR, bgColor); return json; } } @@ -497,20 +507,24 @@ public class SuggestedSites { if (cursor.getCount() == maxCount) { break; } if (excludeUrls != null && excludeUrls.contains(site.url)) { continue; } - final RowBuilder row = cursor.newRow(); - row.add(-1); - row.add(site.url); - row.add(site.title); + final boolean restrictedProfile = RestrictedProfiles.isRestrictedProfile(context); + + if (restrictedProfile == site.restricted) { + final RowBuilder row = cursor.newRow(); + row.add(-1); + row.add(site.url); + row.add(site.title); + } } cursor.setNotificationUri(context.getContentResolver(), BrowserContract.SuggestedSites.CONTENT_URI); return cursor; }
new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3fabf236a680465186c9a9ce9cf4c83e734d8fee GIT binary patch literal 2751 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 FV1k}bR(1dY
index f8d201f052552b0135001634a33f026cbc519193..a2f92d2ec4a08015f959f3d975f6d9843ee5f7a5 GIT binary patch literal 7869 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 b^Md{#GY@ffxhjwe00000NkvXXu0mjfa49ee
--- a/mobile/locales/en-US/chrome/region.properties +++ b/mobile/locales/en-US/chrome/region.properties @@ -68,19 +68,23 @@ browser.suggestedsites.fxaddons.tracking browser.suggestedsites.fxsupport.title=Firefox Help and Support browser.suggestedsites.fxsupport.url=https://support.mozilla.org/en-US/products/mobile browser.suggestedsites.fxsupport.bgcolor=#f37c00 browser.suggestedsites.fxsupport.trackingid=631 browser.suggestedsites.restricted.list.0=restricted_fxsupport browser.suggestedsites.restricted.list.1=webmaker -browser.suggestedsites.restricted.list.2=mozilla +browser.suggestedsites.restricted.list.2=restricted_mozilla -browser.suggestedsites.restricted_fxsupport.title=Firefox Help and Support for Restricted Profiles -browser.suggestedsites.restricted_fxsupport.url=https://support.mozilla.org/en-US/products/mobile +browser.suggestedsites.restricted_fxsupport.title=Firefox Help and Support for a simplified kid-friendly version of Firefox +browser.suggestedsites.restricted_fxsupport.url=https://support.mozilla.org/kb/kids browser.suggestedsites.restricted_fxsupport.bgcolor=#f37c00 -browser.suggestedsites.restricted_fxsupport.trackingid=000 browser.suggestedsites.webmaker.title=Learn the Web: Mozilla Webmaker browser.suggestedsites.webmaker.url=https://webmaker.org/ browser.suggestedsites.webmaker.bgcolor=#f37c00 -browser.suggestedsites.webmaker.trackingid=000 + +# LOCALIZATION NOTE: browser.suggestedsites.restricted_mozilla.url must be different from browser.suggestedsites.mozilla.url +browser.suggestedsites.restricted_mozilla.title=The Mozilla Project +browser.suggestedsites.restricted_mozilla.url=https://www.mozilla.org +browser.suggestedsites.restricted_mozilla.bgcolor=#ce4e41 +browser.suggestedsites.restricted_mozilla.trackingid=632