зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 5 changesets (bug 1366664) for landing non-localizable strings.
Backed out changeset e5dfbde553d6 (bug 1366664) Backed out changeset e078166d9857 (bug 1366664) Backed out changeset 014d0def1489 (bug 1366664) Backed out changeset 51868598947e (bug 1366664) Backed out changeset 6a21eb146fba (bug 1366664)
This commit is contained in:
Ryan VanderMeulen
Родитель
5ce320a16f
Коммит
84df616efe
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 113 B После Ширина: | Высота: | Размер: 88 B |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 7.1 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 14 KiB |
Двоичные данные
mobile/android/app/src/main/res/drawable-nodpi/firstrun_data.png
Двоичные данные
mobile/android/app/src/main/res/drawable-nodpi/firstrun_data.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 70 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 17 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 13 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 62 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 9.0 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 13 KiB |
Двоичные данные
mobile/android/app/src/main/res/drawable-nodpi/firstrun_sync.png
Двоичные данные
mobile/android/app/src/main/res/drawable-nodpi/firstrun_sync.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 24 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 12 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 9.9 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 75 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 120 B После Ширина: | Высота: | Размер: 96 B |
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/button_pressed_action_photon_round" />
|
||||
android:drawable="@drawable/button_pressed_action_orange_round" />
|
||||
<item android:state_enabled="true"
|
||||
android:drawable="@drawable/button_enabled_action_photon_round" />
|
||||
android:drawable="@drawable/button_enabled_action_orange_round" />
|
||||
</selector>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" >
|
||||
<solid android:color="@color/ob_click" />
|
||||
<solid android:color="@color/action_orange" />
|
||||
<corners
|
||||
android:radius="@dimen/standard_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle" >
|
||||
<solid android:color="@color/ob_press" />
|
||||
<solid android:color="@color/action_orange_pressed" />
|
||||
<corners
|
||||
android:radius="5dp" />
|
||||
android:radius="@dimen/standard_corner_radius" />
|
||||
</shape>
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
<ImageView android:id="@+id/firstrun_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/firstrun_background_height"
|
||||
android:layout_marginTop="30dp"
|
||||
android:layout_marginBottom="18dp"
|
||||
android:layout_marginTop="40dp"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_gravity="center"
|
||||
android:adjustViewBounds="true"/>
|
||||
|
|
@ -53,7 +53,6 @@
|
|||
android:padding="30dp"
|
||||
android:gravity="center"
|
||||
android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
|
||||
android:textAllCaps="true"
|
||||
android:text="@string/firstrun_button_next"/>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
<ImageView android:id="@+id/firstrun_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/firstrun_background_height"
|
||||
android:layout_marginTop="30dp"
|
||||
android:layout_marginBottom="18dp"
|
||||
android:layout_marginTop="40dp"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_gravity="center"
|
||||
android:adjustViewBounds="true"/>
|
||||
|
|
@ -31,37 +31,24 @@
|
|||
android:layout_width="@dimen/firstrun_content_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:paddingBottom="40dp"
|
||||
android:textAppearance="@style/TextAppearance.FirstrunLight.Main"/>
|
||||
|
||||
<TextView android:id="@+id/firstrun_subtext"
|
||||
android:layout_width="@dimen/firstrun_content_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="20dp"
|
||||
android:paddingBottom="30dp"
|
||||
android:gravity="center"
|
||||
android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"/>
|
||||
|
||||
<Button android:id="@+id/welcome_account"
|
||||
style="@style/Widget.Firstrun.Button"
|
||||
android:background="@drawable/button_background_action_photon_round"
|
||||
android:background="@drawable/button_background_action_orange_round"
|
||||
android:layout_gravity="center"
|
||||
android:text="@string/firstrun_signin_button"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/welcome_browse"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginBottom="30dp"
|
||||
android:text="@string/firstrun_welcome_button_browser"
|
||||
android:textAllCaps="true"
|
||||
android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"/>
|
||||
</RelativeLayout>
|
||||
<View android:layout_weight="1"
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="match_parent"/>
|
||||
|
||||
<TextView android:id="@+id/welcome_browse"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="30dp"
|
||||
android:gravity="center"
|
||||
android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"/>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@
|
|||
android:layout_gravity="center"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:background="@drawable/button_background_action_blue_round"
|
||||
android:textAllCaps="true"
|
||||
android:text="@string/firstrun_welcome_button_browser" />
|
||||
|
||||
<TextView
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@
|
|||
android:layout_width="@dimen/overlay_prompt_button_width"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/button_background_action_photon_round"
|
||||
android:background="@drawable/button_background_action_orange_round"
|
||||
android:text="@string/tab_queue_prompt_positive_action_button"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="16sp"
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
android:layout_width="@dimen/overlay_prompt_button_width"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/button_background_action_photon_round"
|
||||
android:background="@drawable/button_background_action_orange_round"
|
||||
android:text="@string/tab_queue_prompt_settings_button"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="16sp"
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
|
||||
android:layout_height="52dp"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/button_background_action_photon_round"
|
||||
android:background="@drawable/button_background_action_orange_round"
|
||||
android:text="@string/tracking_protection_prompt_action_button"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="16sp"
|
||||
|
|
|
|||
|
|
@ -137,16 +137,11 @@
|
|||
<color name="affirmative_green">#6FBE4A</color>
|
||||
<color name="rejection_red">#D23228</color>
|
||||
<color name="action_orange">#E66000</color>
|
||||
<color name="action_orange_pressed">#DC5600</color>
|
||||
<color name="link_blue">#0096DD</color>
|
||||
<color name="link_blue_pressed">#0082C6</color>
|
||||
<color name="private_browsing_purple">#CF68FF</color>
|
||||
|
||||
<!-- On boarding -->
|
||||
<color name="ob_click">#0A84FF</color>
|
||||
<color name="ob_press">#003EAA</color>
|
||||
<color name="ob_title">#212121</color>
|
||||
<color name="ob_subtitle">#737373</color>
|
||||
|
||||
<color name="placeholder_active_grey">#222222</color>
|
||||
<color name="placeholder_grey">#777777</color>
|
||||
<color name="private_toolbar_grey">#292C29</color>
|
||||
|
|
|
|||
|
|
@ -727,18 +727,18 @@
|
|||
|
||||
<style name="TextAppearance.FirstrunLight.Main">
|
||||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:textColor">@color/ob_title</item>
|
||||
<item name="android:textColor">@color/text_and_tabs_tray_grey</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.FirstrunRegular.Body">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:textColor">@color/ob_subtitle</item>
|
||||
<item name="android:textColor">@color/placeholder_grey</item>
|
||||
<item name="android:lineSpacingMultiplier">1.25</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.FirstrunRegular.Link">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:textColor">@color/ob_click</item>
|
||||
<item name="android:textColor">@color/link_blue</item>
|
||||
</style>
|
||||
|
||||
<!-- Remote Tabs home panel -->
|
||||
|
|
|
|||
|
|
@ -1013,7 +1013,6 @@ public class BrowserApp extends GeckoApp
|
|||
|
||||
if (prefs.getBoolean(FirstrunAnimationContainer.PREF_FIRSTRUN_ENABLED_OLD, true) &&
|
||||
prefs.getBoolean(FirstrunAnimationContainer.PREF_FIRSTRUN_ENABLED, true)) {
|
||||
showSplashScreen = false;
|
||||
if (!Intent.ACTION_VIEW.equals(intent.getAction())) {
|
||||
// Check to see if a distribution has turned off the first run pager.
|
||||
final Distribution distribution = Distribution.getInstance(BrowserApp.this);
|
||||
|
|
@ -2834,6 +2833,12 @@ public class BrowserApp extends GeckoApp
|
|||
}
|
||||
|
||||
private void showFirstrunPager() {
|
||||
if (Experiments.isInExperimentLocal(this, Experiments.ONBOARDING3_A)) {
|
||||
Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_A);
|
||||
GeckoSharedPrefs.forProfile(this).edit().putString(Experiments.PREF_ONBOARDING_VERSION, Experiments.ONBOARDING3_A).apply();
|
||||
Telemetry.stopUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_A);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mFirstrunAnimationContainer == null) {
|
||||
final ViewStub firstrunPagerStub = (ViewStub) findViewById(R.id.firstrun_pager_stub);
|
||||
|
|
|
|||
|
|
@ -68,6 +68,23 @@ public class Experiments {
|
|||
// Enable processing of background telemetry.
|
||||
public static final String ENABLE_PROCESSING_BACKGROUND_TELEMETRY = "process-background-telemetry";
|
||||
|
||||
/**
|
||||
* Returns if a user is in certain local experiment.
|
||||
* @param experiment Name of experiment to look up
|
||||
* @return returns value for experiment or false if experiment does not exist.
|
||||
*/
|
||||
public static boolean isInExperimentLocal(Context context, String experiment) {
|
||||
if (SwitchBoard.isInBucket(context, 0, 20)) {
|
||||
return Experiments.ONBOARDING3_A.equals(experiment);
|
||||
} else if (SwitchBoard.isInBucket(context, 20, 60)) {
|
||||
return Experiments.ONBOARDING3_B.equals(experiment);
|
||||
} else if (SwitchBoard.isInBucket(context, 60, 100)) {
|
||||
return Experiments.ONBOARDING3_C.equals(experiment);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns list of all active experiments, remote and local.
|
||||
* @return List of experiment names Strings
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public class DataPanel extends FirstrunPanel {
|
|||
public void onClick(View view) {
|
||||
// Set new state.
|
||||
isEnabled = !isEnabled;
|
||||
int newResource = isEnabled ? R.drawable.firstrun_data : R.drawable.firstrun_data;
|
||||
int newResource = isEnabled ? R.drawable.firstrun_data_on : R.drawable.firstrun_data_off;
|
||||
((ImageView) view).setImageResource(newResource);
|
||||
if (isEnabled) {
|
||||
// Always block images.
|
||||
|
|
|
|||
|
|
@ -27,8 +27,7 @@ import org.mozilla.gecko.preferences.GeckoPreferences;
|
|||
public class FirstrunAnimationContainer extends LinearLayout {
|
||||
// See bug 1330714. Need NON_PREF_PREFIX to set from distribution.
|
||||
public static final String PREF_FIRSTRUN_ENABLED_OLD = "startpane_enabled";
|
||||
// After 57, the pref name will be changed. Thus all user since 57 will check this new pref.
|
||||
public static final String PREF_FIRSTRUN_ENABLED = GeckoPreferences.NON_PREF_PREFIX + "startpane_enabled_after_57";
|
||||
public static final String PREF_FIRSTRUN_ENABLED = GeckoPreferences.NON_PREF_PREFIX + "startpane_enabled";
|
||||
|
||||
public static interface OnFinishListener {
|
||||
public void onFinish();
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import com.booking.rtlviewpager.RtlViewPager;
|
|||
|
||||
import org.mozilla.gecko.Telemetry;
|
||||
import org.mozilla.gecko.TelemetryContract;
|
||||
import org.mozilla.gecko.fxa.FirefoxAccounts;
|
||||
import org.mozilla.gecko.home.HomePager.Decor;
|
||||
import org.mozilla.gecko.home.TabMenuStrip;
|
||||
import org.mozilla.gecko.restrictions.Restrictions;
|
||||
|
|
@ -68,8 +67,6 @@ public class FirstrunPager extends RtlViewPager {
|
|||
|
||||
if (Restrictions.isRestrictedProfile(context)) {
|
||||
panels = FirstrunPagerConfig.getRestricted();
|
||||
} else if (FirefoxAccounts.firefoxAccountsExist(context)) {
|
||||
panels = FirstrunPagerConfig.forFxAUser(appContext);
|
||||
} else {
|
||||
panels = FirstrunPagerConfig.getDefault(appContext);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,20 +26,25 @@ public class FirstrunPagerConfig {
|
|||
|
||||
public static List<FirstrunPanelConfig> getDefault(Context context) {
|
||||
final List<FirstrunPanelConfig> panels = new LinkedList<>();
|
||||
panels.add(SimplePanelConfigs.welcomePanelConfig);
|
||||
panels.add(SimplePanelConfigs.privatePanelConfig);
|
||||
panels.add(SimplePanelConfigs.customizePanelConfig);
|
||||
panels.add(SimplePanelConfigs.syncPanelConfig);
|
||||
|
||||
return panels;
|
||||
}
|
||||
|
||||
public static List<FirstrunPanelConfig> forFxAUser(Context context) {
|
||||
final List<FirstrunPanelConfig> panels = new LinkedList<>();
|
||||
panels.add(SimplePanelConfigs.welcomePanelConfig);
|
||||
panels.add(SimplePanelConfigs.privatePanelConfig);
|
||||
panels.add(SimplePanelConfigs.customizeLastPanelConfig);
|
||||
|
||||
if (Experiments.isInExperimentLocal(context, Experiments.ONBOARDING3_B)) {
|
||||
panels.add(SimplePanelConfigs.urlbarPanelConfig);
|
||||
panels.add(SimplePanelConfigs.bookmarksPanelConfig);
|
||||
panels.add(SimplePanelConfigs.dataPanelConfig);
|
||||
panels.add(SimplePanelConfigs.syncPanelConfig);
|
||||
panels.add(SimplePanelConfigs.signInPanelConfig);
|
||||
Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_B);
|
||||
GeckoSharedPrefs.forProfile(context).edit().putString(Experiments.PREF_ONBOARDING_VERSION, Experiments.ONBOARDING3_B).apply();
|
||||
} else if (Experiments.isInExperimentLocal(context, Experiments.ONBOARDING3_C)) {
|
||||
panels.add(SimplePanelConfigs.tabqueuePanelConfig);
|
||||
panels.add(SimplePanelConfigs.readerviewPanelConfig);
|
||||
panels.add(SimplePanelConfigs.accountPanelConfig);
|
||||
Telemetry.startUISession(TelemetryContract.Session.EXPERIMENT, Experiments.ONBOARDING3_C);
|
||||
GeckoSharedPrefs.forProfile(context).edit().putString(Experiments.PREF_ONBOARDING_VERSION, Experiments.ONBOARDING3_C).apply();
|
||||
} else {
|
||||
Log.e(LOGTAG, "Not in an experiment!");
|
||||
panels.add(SimplePanelConfigs.signInPanelConfig);
|
||||
}
|
||||
return panels;
|
||||
}
|
||||
|
||||
|
|
@ -89,12 +94,14 @@ public class FirstrunPagerConfig {
|
|||
}
|
||||
|
||||
private static class SimplePanelConfigs {
|
||||
public static final FirstrunPanelConfig welcomePanelConfig = new FirstrunPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_panel_title_welcome, R.drawable.firstrun_welcome, R.string.firstrun_urlbar_message, R.string.firstrun_urlbar_subtext);
|
||||
public static final FirstrunPanelConfig privatePanelConfig = new FirstrunPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_panel_title_privacy, R.drawable.firstrun_private, R.string.firstrun_privacy_message, R.string.firstrun_privacy_subtext);
|
||||
public static final FirstrunPanelConfig customizePanelConfig = new FirstrunPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_panel_title_customize, R.drawable.firstrun_data, R.string.firstrun_customize_message, R.string.firstrun_customize_subtext);
|
||||
public static final FirstrunPanelConfig customizeLastPanelConfig = new FirstrunPanelConfig(LastPanel.class.getName(), R.string.firstrun_panel_title_customize, R.drawable.firstrun_data, R.string.firstrun_customize_message, R.string.firstrun_customize_subtext);
|
||||
|
||||
public static final FirstrunPanelConfig syncPanelConfig = new FirstrunPanelConfig(SyncPanel.class.getName(), R.string.firstrun_sync_title, R.drawable.firstrun_sync, R.string.firstrun_sync_message, R.string.firstrun_sync_subtext);
|
||||
public static final FirstrunPanelConfig urlbarPanelConfig = new FirstrunPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_panel_title_welcome, R.drawable.firstrun_urlbar, R.string.firstrun_urlbar_message, R.string.firstrun_urlbar_subtext);
|
||||
public static final FirstrunPanelConfig bookmarksPanelConfig = new FirstrunPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_bookmarks_title, R.drawable.firstrun_bookmarks, R.string.firstrun_bookmarks_message, R.string.firstrun_bookmarks_subtext);
|
||||
public static final FirstrunPanelConfig dataPanelConfig = new FirstrunPanelConfig(DataPanel.class.getName(), R.string.firstrun_data_title, R.drawable.firstrun_data_off, R.string.firstrun_data_message, R.string.firstrun_data_subtext);
|
||||
public static final FirstrunPanelConfig syncPanelConfig = new FirstrunPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_sync_title, R.drawable.firstrun_sync, R.string.firstrun_sync_message, R.string.firstrun_sync_subtext);
|
||||
public static final FirstrunPanelConfig signInPanelConfig = new FirstrunPanelConfig(SyncPanel.class.getName(), R.string.pref_sync, R.drawable.firstrun_signin, R.string.firstrun_signin_message, R.string.firstrun_welcome_button_browser);
|
||||
|
||||
public static final FirstrunPanelConfig tabqueuePanelConfig = new FirstrunPanelConfig(TabQueuePanel.class.getName(), R.string.firstrun_tabqueue_title, R.drawable.firstrun_tabqueue_off, R.string.firstrun_tabqueue_message_off, R.string.firstrun_tabqueue_subtext_off);
|
||||
public static final FirstrunPanelConfig readerviewPanelConfig = new FirstrunPanelConfig(FirstrunPanel.class.getName(), R.string.firstrun_readerview_title, R.drawable.firstrun_readerview, R.string.firstrun_readerview_message, R.string.firstrun_readerview_subtext);
|
||||
public static final FirstrunPanelConfig accountPanelConfig = new FirstrunPanelConfig(SyncPanel.class.getName(), R.string.firstrun_account_title, R.drawable.firstrun_account, R.string.firstrun_account_message, R.string.firstrun_button_notnow);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public class FirstrunPanel extends Fragment {
|
|||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {
|
||||
final ViewGroup root = (ViewGroup) inflater.inflate(R.layout.firstrun_basepanel_checkable_fragment, container, false);
|
||||
final Bundle args = getArguments();
|
||||
Bundle args = getArguments();
|
||||
if (args != null) {
|
||||
final int imageRes = args.getInt(FirstrunPagerConfig.KEY_IMAGE);
|
||||
final int textRes = args.getInt(FirstrunPagerConfig.KEY_TEXT);
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.gecko.firstrun;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import org.mozilla.gecko.R;
|
||||
import org.mozilla.gecko.Telemetry;
|
||||
import org.mozilla.gecko.TelemetryContract;
|
||||
|
||||
public class LastPanel extends FirstrunPanel {
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {
|
||||
final ViewGroup root = (ViewGroup) inflater.inflate(R.layout.firstrun_basepanel_checkable_fragment, container, false);
|
||||
final Bundle args = getArguments();
|
||||
if (args != null) {
|
||||
final int imageRes = args.getInt(FirstrunPagerConfig.KEY_IMAGE);
|
||||
final int textRes = args.getInt(FirstrunPagerConfig.KEY_TEXT);
|
||||
final int subtextRes = args.getInt(FirstrunPagerConfig.KEY_SUBTEXT);
|
||||
|
||||
((ImageView) root.findViewById(R.id.firstrun_image)).setImageResource(imageRes);
|
||||
((TextView) root.findViewById(R.id.firstrun_text)).setText(textRes);
|
||||
((TextView) root.findViewById(R.id.firstrun_subtext)).setText(subtextRes);
|
||||
((TextView) root.findViewById(R.id.firstrun_link)).setText(R.string.firstrun_welcome_button_browser);
|
||||
|
||||
}
|
||||
|
||||
root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "firstrun-next");
|
||||
close();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
return root;
|
||||
}
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ public class SyncPanel extends FirstrunPanel {
|
|||
|
||||
((ImageView) root.findViewById(R.id.firstrun_image)).setImageResource(imageRes);
|
||||
((TextView) root.findViewById(R.id.firstrun_text)).setText(textRes);
|
||||
((TextView) root.findViewById(R.id.firstrun_subtext)).setText(subtextRes);
|
||||
((TextView) root.findViewById(R.id.welcome_browse)).setText(subtextRes);
|
||||
}
|
||||
|
||||
root.findViewById(R.id.welcome_account).setOnClickListener(new View.OnClickListener() {
|
||||
|
|
|
|||
|
|
@ -3,14 +3,9 @@
|
|||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<!ENTITY firstrun_panel_title_welcome "Welcome">
|
||||
<!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;">
|
||||
<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web.">
|
||||
<!ENTITY firstrun_panel_title_privacy "Privacy">
|
||||
<!ENTITY firstrun_privacy_message "Browse like no one\'s watching">
|
||||
<!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing.">
|
||||
<!ENTITY firstrun_panel_title_customize "Customize">
|
||||
<!ENTITY firstrun_customize_message "Make Firefox your own.">
|
||||
<!ENTITY firstrun_customize_subtext "Customize Firefox with add-ons. Block ads, add features, or choose a new theme to reflect your personality.">
|
||||
|
||||
<!ENTITY firstrun_urlbar_message "Welcome to &brandShortName;">
|
||||
<!ENTITY firstrun_urlbar_subtext "Find things faster with helpful search suggestion shortcuts.">
|
||||
<!ENTITY firstrun_bookmarks_title "History">
|
||||
<!ENTITY firstrun_bookmarks_message "Your faves, front and center">
|
||||
<!ENTITY firstrun_bookmarks_subtext "Get results from your bookmarks and history when you search.">
|
||||
|
|
@ -18,8 +13,8 @@
|
|||
<!ENTITY firstrun_data_message "Less data, more savings">
|
||||
<!ENTITY firstrun_data_subtext2 "Turn off images to spend less data on every site you visit.">
|
||||
<!ENTITY firstrun_sync_title "Sync">
|
||||
<!ENTITY firstrun_sync_message2 "Pick up where you left off.">
|
||||
<!ENTITY firstrun_sync_subtext2 "Use Sync to find the bookmarks, passwords, and other things you save to Firefox on all your devices.">
|
||||
<!ENTITY firstrun_sync_message "&brandShortName;, always by your side">
|
||||
<!ENTITY firstrun_sync_subtext "Sync your tabs, passwords, and more everywhere you use it.">
|
||||
<!ENTITY firstrun_signin_message "Get connected, get started">
|
||||
<!ENTITY firstrun_signin_button "Sign in to Sync">
|
||||
<!ENTITY onboard_start_button_browser "Start Browsing">
|
||||
|
|
|
|||
|
|
@ -648,7 +648,6 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
|
|||
'firstrun/FirstrunPager.java',
|
||||
'firstrun/FirstrunPagerConfig.java',
|
||||
'firstrun/FirstrunPanel.java',
|
||||
'firstrun/LastPanel.java',
|
||||
'firstrun/RestrictedWelcomePanel.java',
|
||||
'firstrun/SyncPanel.java',
|
||||
'firstrun/TabQueuePanel.java',
|
||||
|
|
|
|||
|
|
@ -31,26 +31,36 @@
|
|||
|
||||
<string name="firstrun_panel_title_welcome">&firstrun_panel_title_welcome;</string>
|
||||
|
||||
<string name="firstrun_urlbar_message">&firstrun_urlbar_message2;</string>
|
||||
<string name="firstrun_urlbar_subtext">&firstrun_urlbar_subtext2;</string>
|
||||
<string name="firstrun_panel_title_privacy">&firstrun_panel_title_privacy;</string>
|
||||
<string name="firstrun_privacy_message">&firstrun_privacy_message;</string>
|
||||
<string name="firstrun_privacy_subtext">&firstrun_privacy_subtext;</string>
|
||||
<string name="firstrun_panel_title_customize">&firstrun_panel_title_customize;</string>
|
||||
<string name="firstrun_customize_message">&firstrun_customize_message;</string>
|
||||
<string name="firstrun_customize_subtext">&firstrun_customize_subtext;</string>
|
||||
<string name="firstrun_urlbar_message">&firstrun_urlbar_message;</string>
|
||||
<string name="firstrun_urlbar_subtext">&firstrun_urlbar_subtext;</string>
|
||||
<string name="firstrun_bookmarks_title">&firstrun_bookmarks_title;</string>
|
||||
<string name="firstrun_bookmarks_message">&firstrun_bookmarks_message;</string>
|
||||
<string name="firstrun_bookmarks_subtext">&firstrun_bookmarks_subtext;</string>
|
||||
<string name="firstrun_data_title">&firstrun_data_title;</string>
|
||||
<string name="firstrun_data_message">&firstrun_data_message;</string>
|
||||
<string name="firstrun_data_subtext">&firstrun_data_subtext2;</string>
|
||||
<string name="firstrun_sync_title">&firstrun_sync_title;</string>
|
||||
<string name="firstrun_sync_message">&firstrun_sync_message2;</string>
|
||||
<string name="firstrun_sync_subtext">&firstrun_sync_subtext2;</string>
|
||||
<string name="firstrun_sync_message">&firstrun_sync_message;</string>
|
||||
<string name="firstrun_sync_subtext">&firstrun_sync_subtext;</string>
|
||||
<string name="firstrun_signin_message">&firstrun_signin_message;</string>
|
||||
<string name="firstrun_signin_button">&firstrun_signin_button;</string>
|
||||
<string name="firstrun_welcome_button_browser">&onboard_start_button_browser;</string>
|
||||
<string name="firstrun_button_notnow">&firstrun_button_notnow;</string>
|
||||
<string name="firstrun_button_next">&firstrun_button_next;</string>
|
||||
|
||||
<string name="firstrun_tabqueue_title">&firstrun_tabqueue_title;</string>
|
||||
<string name="firstrun_tabqueue_message_off">&firstrun_tabqueue_message_off;</string>
|
||||
<string name="firstrun_tabqueue_subtext_off">&firstrun_tabqueue_subtext_off;</string>
|
||||
<string name="firstrun_tabqueue_message_on">&firstrun_tabqueue_message_on;</string>
|
||||
<string name="firstrun_tabqueue_subtext_on">&firstrun_tabqueue_subtext_on;</string>
|
||||
|
||||
<string name="firstrun_readerview_title">&firstrun_readerview_title;</string>
|
||||
<string name="firstrun_readerview_message">&firstrun_readerview_message;</string>
|
||||
<string name="firstrun_readerview_subtext">&firstrun_readerview_subtext;</string>
|
||||
|
||||
<string name="firstrun_account_title">&firstrun_account_title;</string>
|
||||
<string name="firstrun_account_message">&firstrun_account_message;</string>
|
||||
|
||||
<string name="firstrun_welcome_restricted">&onboard_start_restricted1;</string>
|
||||
|
||||
<string name="bookmarks_title">&bookmarks_title;</string>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
android:layout_marginStart="100dp"
|
||||
android:layout_marginRight="30dp"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:background="@drawable/button_background_action_photon_round"
|
||||
android:background="@drawable/button_background_action_orange_round"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingRight="16dp"
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
<Button
|
||||
android:id="@+id/button"
|
||||
style="@style/Widget.Firstrun.Button"
|
||||
android:background="@drawable/button_background_action_photon_round"
|
||||
android:background="@drawable/button_background_action_orange_round"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginBottom="30dp"/>
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче