wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 710331 - UX for bookmarks and history import. r=mfinkle

Browse Source
This commit is contained in:
Gian-Carlo Pascutto 2012-01-25 22:10:01 +01:00
parent d336c36446
commit db22400712
8 changed files with 201 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/Makefile.in
View File

@ -92,6 +92,7 @@ FENNEC_JAVA_FILES = \
sqlite/ByteBufferInputStream.java \
sqlite/SQLiteBridge.java \
sqlite/SQLiteBridgeException.java \
SetupScreen.java \
SurfaceLockInfo.java \
Tab.java \
Tabs.java \
@ -228,6 +229,7 @@ RES_LAYOUT = \
res/layout/notification_progress.xml \
res/layout/notification_progress_text.xml \
res/layout/site_setting_title.xml \
res/layout/setup_screen.xml \
res/layout/tabs_row.xml \
res/layout/tabs_tray.xml \
res/layout/list_item_header.xml \

148
mobile/android/base/SetupScreen.java Normal file
View File

@ -0,0 +1,148 @@
/* -*- Mode: Java; tab-width: 20; indent-tabs-mode: nil; -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Android code.
*
* The Initial Developer of the Original Code is Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Gian-Carlo Pascutto <gpascutto@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
package org.mozilla.gecko;
import android.app.Dialog;
import android.content.Context;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.widget.ImageView;
import java.util.Timer;
import java.util.TimerTask;
import org.mozilla.gecko.R;
public class SetupScreen extends Dialog
{
private static final String LOGTAG = "SetupScreen";
// Default delay before showing dialog, in milliseconds
private static final int DEFAULT_DELAY = 100;
private AnimationDrawable mProgressSpinner;
private Context mContext;
private Timer mTimer;
private TimerTask mShowTask;
public class ShowTask extends TimerTask {
private Handler mHandler;
public ShowTask(Handler aHandler) {
mHandler = aHandler;
}
@Override
public void run() {
mHandler.post(new Runnable() {
public void run() {
SetupScreen.this.show();
}
});
}
@Override
public boolean cancel() {
boolean stillInQueue = super.cancel();
if (!stillInQueue) {
mHandler.post(new Runnable() {
public void run() {
// SetupScreen.dismiss calls us,
// we need to call the real Dialog.dismiss.
SetupScreen.super.dismiss();
}
});
}
return stillInQueue;
}
}
public SetupScreen(Context aContext) {
super(aContext, android.R.style.Theme_NoTitleBar_Fullscreen);
mContext = aContext;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.setup_screen);
setCancelable(false);
setTitle(R.string.splash_firstrun);
ImageView spinnerImage = (ImageView)findViewById(R.id.spinner_image);
mProgressSpinner = (AnimationDrawable)spinnerImage.getBackground();
spinnerImage.setImageDrawable(mProgressSpinner);
}
@Override
public void onWindowFocusChanged (boolean hasFocus) {
mProgressSpinner.start();
}
public void showDelayed(Handler aHandler) {
showDelayed(aHandler, DEFAULT_DELAY);
}
// Delay showing the dialog until at least aDelay ms have
// passed. We need to know the handler to (eventually) post the UI
// actions on.
public void showDelayed(Handler aHandler, int aDelay) {
mTimer = new Timer("SetupScreen");
mShowTask = new ShowTask(aHandler);
mTimer.schedule(mShowTask, aDelay);
}
@Override
public void dismiss() {
// Cancel the timers/tasks if we were using showDelayed,
// and post to the correct handler.
if (mShowTask != null) {
mShowTask.cancel();
mShowTask = null;
} else {
// If not using showDelayed, just dismiss here.
super.dismiss();
}
if (mTimer != null) {
mTimer.cancel();
mTimer = null;
}
}
}

46
mobile/android/base/resources/layout/setup_screen.xml Normal file
View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Screen"
android:background="@drawable/tabs_tray_bg_repeat"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:layout_gravity="center" >
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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="24dp"
android:src="@drawable/logo" />
<LinearLayout android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" >
<ImageView android:id="@+id/spinner_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:background="@drawable/progress_spinner" />
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textSize="15dp"
android:textColor="#FFFFFF"
android:typeface="sans"
android:text="@string/splash_firstrun" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

1
mobile/android/branding/aurora/android-resources.mn
View File

@ -3,4 +3,5 @@ mobile/android/app/android/drawable/alertdownloads.png
mobile/android/branding/aurora/content/splash.png
mobile/android/branding/aurora/content/splash_v9.9.png
mobile/android/branding/aurora/content/splash_v8.9.png
mobile/android/branding/aurora/content/logo.png
mobile/android/branding/aurora/content/favicon32.png

1
mobile/android/branding/beta/android-resources.mn
View File

@ -3,4 +3,5 @@ mobile/android/app/android/drawable/alertdownloads.png
mobile/android/branding/beta/content/splash.png
mobile/android/branding/beta/content/splash_v9.9.png
mobile/android/branding/beta/content/splash_v8.9.png
mobile/android/branding/beta/content/logo.png
mobile/android/branding/beta/content/favicon32.png

1
mobile/android/branding/nightly/android-resources.mn
View File

@ -3,4 +3,5 @@ mobile/android/app/android/drawable/alertdownloads.png
mobile/android/branding/nightly/content/splash.png
mobile/android/branding/nightly/content/splash_v9.9.png
mobile/android/branding/nightly/content/splash_v8.9.png
mobile/android/branding/nightly/content/logo.png
mobile/android/branding/nightly/content/favicon32.png

1
mobile/android/branding/official/android-resources.mn
View File

@ -3,4 +3,5 @@ mobile/android/app/android/drawable/alertdownloads.png
mobile/android/branding/official/content/splash.png
mobile/android/branding/official/content/splash_v9.9.png
mobile/android/branding/official/content/splash_v8.9.png
mobile/android/branding/official/content/logo.png
mobile/android/branding/official/content/favicon32.png

1
mobile/android/branding/unofficial/android-resources.mn
View File

@ -4,3 +4,4 @@ mobile/android/branding/unofficial/content/splash.png
mobile/android/branding/unofficial/content/splash_v9.9.png
mobile/android/branding/unofficial/content/splash_v8.9.png
mobile/android/branding/unofficial/content/favicon32.png
mobile/android/branding/unofficial/content/logo.png