mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 895670 - Remove SetupScreen and associated assets. r=mfinkle
--HG-- extra : rebase_source : 67e551da22e8490138a94cc303c1102ef49599e9
This commit is contained in:
Nick Alexander
parent
ca4893a7d6
commit
8f45876edf
@ -2247,48 +2247,7 @@ abstract public class GeckoApp
|
||||
// Do a migration run on the first start after an upgrade.
|
||||
if (!GeckoApp.sIsUsingCustomProfile &&
|
||||
!profileMigrator.hasMigrationRun()) {
|
||||
// Show the "Setting up Fennec" screen if this takes
|
||||
// a while.
|
||||
|
||||
// Create a "final" holder for the setup screen so that we can
|
||||
// create it in startCallback and still find a reference to it
|
||||
// in stopCallback. (We must create it on the UI thread to fix
|
||||
// bug 788216). Note that synchronization is not a problem here
|
||||
// since it is only ever touched on the UI thread.
|
||||
final SetupScreen[] setupScreenHolder = new SetupScreen[1];
|
||||
|
||||
final Runnable startCallback = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ThreadUtils.postToUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
setupScreenHolder[0] = new SetupScreen(app);
|
||||
setupScreenHolder[0].show();
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
final Runnable stopCallback = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ThreadUtils.postToUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
SetupScreen screen = setupScreenHolder[0];
|
||||
// screen will never be null if this code runs, but
|
||||
// stranger things have happened...
|
||||
if (screen != null) {
|
||||
screen.dismiss();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
profileMigrator.setLongOperationCallbacks(startCallback,
|
||||
stopCallback);
|
||||
profileMigrator.launchPlaces(profileDir);
|
||||
finishProfileMigration();
|
||||
}
|
||||
|
||||
@ -150,7 +150,6 @@ FENNEC_JAVA_FILES = \
|
||||
ServiceNotificationClient.java \
|
||||
ScrollAnimator.java \
|
||||
SessionParser.java \
|
||||
SetupScreen.java \
|
||||
ShapedButton.java \
|
||||
SharedPreferencesHelper.java \
|
||||
SiteIdentityPopup.java \
|
||||
@ -477,7 +476,6 @@ RES_LAYOUT = \
|
||||
res/layout/search_engine_row.xml \
|
||||
res/layout/site_setting_item.xml \
|
||||
res/layout/site_setting_title.xml \
|
||||
res/layout/setup_screen.xml \
|
||||
res/layout/shared_ui_components.xml \
|
||||
res/layout/site_identity.xml \
|
||||
res/layout/suggestion_item.xml \
|
||||
@ -1130,10 +1128,40 @@ RES_DRAWABLE += \
|
||||
res/drawable/webapp_titlebar_bg.xml \
|
||||
$(NULL)
|
||||
|
||||
MOZ_BRANDING_DRAWABLE_MDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' '; fi)
|
||||
|
||||
RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LARGE_LAND_V11) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_LAYOUT_XLARGE_LAND_V11) $(RES_VALUES) $(RES_VALUES_LAND) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_LARGE_LAND_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_VALUES_V14) $(RES_XML) $(RES_XML_V11) $(RES_ANIM) $(RES_DRAWABLE_MDPI) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
|
||||
RESOURCES += $(RES_DRAWABLE)
|
||||
RESOURCES = \
|
||||
$(RES_ANIM) \
|
||||
$(RES_COLOR) \
|
||||
$(RES_DRAWABLE) \
|
||||
$(RES_DRAWABLE_HDPI) \
|
||||
$(RES_DRAWABLE_HDPI_V11) \
|
||||
$(RES_DRAWABLE_LARGE_HDPI_V11) \
|
||||
$(RES_DRAWABLE_LARGE_MDPI_V11) \
|
||||
$(RES_DRAWABLE_LARGE_XHDPI_V11) \
|
||||
$(RES_DRAWABLE_LDPI) \
|
||||
$(RES_DRAWABLE_MDPI) \
|
||||
$(RES_DRAWABLE_MDPI_V11) \
|
||||
$(RES_DRAWABLE_XHDPI) \
|
||||
$(RES_DRAWABLE_XHDPI_V11) \
|
||||
$(RES_DRAWABLE_XLARGE_HDPI_V11) \
|
||||
$(RES_DRAWABLE_XLARGE_MDPI_V11) \
|
||||
$(RES_DRAWABLE_XLARGE_XHDPI_V11) \
|
||||
$(RES_LAYOUT) \
|
||||
$(RES_LAYOUT_LARGE_LAND_V11) \
|
||||
$(RES_LAYOUT_LARGE_V11) \
|
||||
$(RES_LAYOUT_XLARGE_LAND_V11) \
|
||||
$(RES_LAYOUT_XLARGE_V11) \
|
||||
$(RES_MENU) \
|
||||
$(RES_VALUES) \
|
||||
$(RES_VALUES_LAND) \
|
||||
$(RES_VALUES_LAND_V14) \
|
||||
$(RES_VALUES_LARGE_LAND_V11) \
|
||||
$(RES_VALUES_LARGE_V11) \
|
||||
$(RES_VALUES_V11) \
|
||||
$(RES_VALUES_V14) \
|
||||
$(RES_VALUES_XLARGE_V11) \
|
||||
$(RES_XML) \
|
||||
$(RES_XML_V11) \
|
||||
$(NULL)
|
||||
|
||||
RES_DIRS= \
|
||||
res/layout \
|
||||
@ -1330,11 +1358,6 @@ res/drawable-xxhdpi/icon.png: $(MOZ_APP_ICON)
|
||||
$(NSINSTALL) -D res/drawable-xxhdpi
|
||||
cp $(ICON_PATH_XXHDPI) $@
|
||||
|
||||
RES_BRANDING_DRAWABLE_MDPI = $(addprefix res/drawable-mdpi/,$(notdir $(MOZ_BRANDING_DRAWABLE_MDPI)))
|
||||
$(RES_BRANDING_DRAWABLE_MDPI): $(addprefix $(topsrcdir)/,$(MOZ_BRANDING_DRAWABLE_MDPI))
|
||||
$(NSINSTALL) -D res/drawable-mdpi
|
||||
$(NSINSTALL) $^ res/drawable-mdpi/
|
||||
|
||||
$(RES_DIRS): $(subst res/,$(srcdir)/resources/,$(RESOURCES))
|
||||
$(RM) -r $@
|
||||
$(NSINSTALL) -D $@
|
||||
@ -1347,7 +1370,6 @@ res/values/strings.xml:
|
||||
$(MAKE) -C locales
|
||||
|
||||
all_resources = \
|
||||
res/drawable-mdpi/logo.png \
|
||||
res/drawable-mdpi/icon.png \
|
||||
res/drawable-hdpi/icon.png \
|
||||
res/drawable-xhdpi/icon.png \
|
||||
@ -1356,7 +1378,6 @@ all_resources = \
|
||||
AndroidManifest.xml \
|
||||
$(RESOURCES) \
|
||||
$(PP_RES_XML) \
|
||||
$(RES_BRANDING_DRAWABLE_MDPI) \
|
||||
$(NULL)
|
||||
|
||||
R.java: $(all_resources)
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
/* -*- Mode: Java; tab-width: 20; 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;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.graphics.drawable.AnimationDrawable;
|
||||
import android.os.Bundle;
|
||||
import android.widget.ImageView;
|
||||
|
||||
public class SetupScreen extends Dialog
|
||||
{
|
||||
private static final String LOGTAG = "SetupScreen";
|
||||
private AnimationDrawable mProgressSpinner;
|
||||
|
||||
public SetupScreen(Context aContext) {
|
||||
super(aContext, android.R.style.Theme_NoTitleBar_Fullscreen);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.setup_screen);
|
||||
setCancelable(false);
|
||||
|
||||
setTitle(R.string.splash_settingup);
|
||||
|
||||
ImageView spinnerImage = (ImageView)findViewById(R.id.spinner_image);
|
||||
mProgressSpinner = (AnimationDrawable)spinnerImage.getBackground();
|
||||
spinnerImage.setImageDrawable(mProgressSpinner);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWindowFocusChanged (boolean hasFocus) {
|
||||
mProgressSpinner.start();
|
||||
}
|
||||
}
|
||||
@ -3,9 +3,6 @@
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
|
||||
<!ENTITY splash_settingup "Setting up your &brandShortName;">
|
||||
<!ENTITY splash_bookmarks_history "We are updating your bookmarks and history, which may take a minute or so.">
|
||||
|
||||
<!ENTITY no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
|
||||
<!ENTITY error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
|
||||
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 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/. -->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/background_normal">
|
||||
|
||||
<LinearLayout android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:gravity="center"
|
||||
android:layout_gravity="center" >
|
||||
|
||||
<ImageView android:id="@+id/image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:src="@drawable/logo" />
|
||||
|
||||
<TextView android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16dp"
|
||||
android:textColor="#000000"
|
||||
android:typeface="sans"
|
||||
android:text="@string/splash_settingup" />
|
||||
|
||||
<TextView android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginLeft="32dp"
|
||||
android:layout_marginRight="32dp"
|
||||
android:textSize="14dp"
|
||||
android:textColor="#7C7D7F"
|
||||
android:typeface="sans"
|
||||
android:text="@string/splash_bookmarks_history" />
|
||||
|
||||
<ImageView android:id="@+id/spinner_image"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/progress_spinner" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@ -18,8 +18,6 @@
|
||||
<resources>
|
||||
<string name="moz_app_displayname">@MOZ_APP_DISPLAYNAME@</string>
|
||||
#include ../services/strings.xml.in
|
||||
<string name="splash_settingup">&splash_settingup;</string>
|
||||
<string name="splash_bookmarks_history">&splash_bookmarks_history;</string>
|
||||
<string name="no_space_to_start_error">&no_space_to_start_error;</string>
|
||||
<string name="error_loading_file">&error_loading_file;</string>
|
||||
|
||||
@ -44,11 +42,11 @@
|
||||
|
||||
<string name="launcher_shortcuts_title">&launcher_shortcuts_title;</string>
|
||||
<string name="launcher_shortcuts_empty">&launcher_shortcuts_empty;</string>
|
||||
|
||||
|
||||
<string name="choose_file">&choose_file;</string>
|
||||
|
||||
<string name="awesomebar_default_text">&awesomebar_default_text;</string>
|
||||
|
||||
|
||||
<string name="remote_tabs">&remote_tabs;</string>
|
||||
<string name="remote_tabs_show_all">&remote_tabs_show_all;</string>
|
||||
|
||||
@ -246,7 +244,7 @@
|
||||
<string name="abouthome_about_apps">&abouthome_about_apps3;</string>
|
||||
<string name="abouthome_sync_bold_name">&abouthome_sync_bold_name;</string>
|
||||
<string name="abouthome_apps_bold_name">&abouthome_apps_bold_name2;</string>
|
||||
|
||||
|
||||
<string name="abouthome_topsites_edit">&abouthome_topsites_edit;</string>
|
||||
<string name="abouthome_topsites_pin">&abouthome_topsites_pin;</string>
|
||||
<string name="abouthome_topsites_unpin">&abouthome_topsites_unpin;</string>
|
||||
@ -301,12 +299,12 @@
|
||||
<!-- Updater notifications -->
|
||||
<string name="updater_start_title">&updater_start_title2;</string>
|
||||
<string name="updater_start_select">&updater_start_select2;</string>
|
||||
|
||||
|
||||
<string name="updater_downloading_title">&updater_downloading_title2;</string>
|
||||
<string name="updater_downloading_title_failed">&updater_downloading_title_failed2;</string>
|
||||
<string name="updater_downloading_select">&updater_downloading_select2;</string>
|
||||
<string name="updater_downloading_retry">&updater_downloading_retry2;</string>
|
||||
|
||||
|
||||
<string name="updater_apply_title">&updater_apply_title2;</string>
|
||||
<string name="updater_apply_select">&updater_apply_select2;</string>
|
||||
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
mobile/android/branding/aurora/content/logo.png
|
||||
mobile/android/branding/aurora/content/favicon32.png
|
||||
@ -5,7 +5,5 @@
|
||||
chrome.jar:
|
||||
% content branding %content/branding/
|
||||
content/branding/about.png (about.png)
|
||||
content/branding/logoWordmark.png (logoWordmark.png)
|
||||
content/branding/logo.png (logo.png)
|
||||
content/branding/favicon32.png (favicon32.png)
|
||||
content/branding/favicon64.png (favicon64.png)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
@ -1,2 +0,0 @@
|
||||
mobile/android/branding/beta/content/logo.png
|
||||
mobile/android/branding/beta/content/favicon32.png
|
||||
@ -5,7 +5,5 @@
|
||||
chrome.jar:
|
||||
% content branding %content/branding/
|
||||
content/branding/about.png (about.png)
|
||||
content/branding/logoWordmark.png (logoWordmark.png)
|
||||
content/branding/logo.png (logo.png)
|
||||
content/branding/favicon32.png (favicon32.png)
|
||||
content/branding/favicon64.png (favicon64.png)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@ -1,2 +0,0 @@
|
||||
mobile/android/branding/nightly/content/logo.png
|
||||
mobile/android/branding/nightly/content/favicon32.png
|
||||
@ -5,7 +5,5 @@
|
||||
chrome.jar:
|
||||
% content branding %content/branding/
|
||||
content/branding/about.png (about.png)
|
||||
content/branding/logoWordmark.png (logoWordmark.png)
|
||||
content/branding/logo.png (logo.png)
|
||||
content/branding/favicon32.png (favicon32.png)
|
||||
content/branding/favicon64.png (favicon64.png)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
@ -1,2 +0,0 @@
|
||||
mobile/android/branding/official/content/logo.png
|
||||
mobile/android/branding/official/content/favicon32.png
|
||||
@ -5,7 +5,5 @@
|
||||
chrome.jar:
|
||||
% content branding %content/branding/
|
||||
content/branding/about.png (about.png)
|
||||
content/branding/logoWordmark.png (logoWordmark.png)
|
||||
content/branding/logo.png (logo.png)
|
||||
content/branding/favicon32.png (favicon32.png)
|
||||
content/branding/favicon64.png (favicon64.png)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@ -1,2 +0,0 @@
|
||||
mobile/android/branding/unofficial/content/favicon32.png
|
||||
mobile/android/branding/unofficial/content/logo.png
|
||||
@ -5,7 +5,5 @@
|
||||
chrome.jar:
|
||||
% content branding %content/branding/
|
||||
content/branding/about.png (about.png)
|
||||
content/branding/logoWordmark.png (logoWordmark.png)
|
||||
content/branding/logo.png (logo.png)
|
||||
content/branding/favicon32.png (favicon32.png)
|
||||
content/branding/favicon64.png (favicon64.png)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
Loading…
Reference in New Issue
Block a user