mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 991256 - Rename preprocessed Gecko* -> Themed* in widget/. r=bnicholson 

--HG--
rename : mobile/android/base/widget/GeckoEditText.java.in => mobile/android/base/widget/ThemedEditText.java.in
rename : mobile/android/base/widget/GeckoImageButton.java.in => mobile/android/base/widget/ThemedImageButton.java.in
rename : mobile/android/base/widget/GeckoImageView.java.in => mobile/android/base/widget/ThemedImageView.java.in
rename : mobile/android/base/widget/GeckoLinearLayout.java.in => mobile/android/base/widget/ThemedLinearLayout.java.in
rename : mobile/android/base/widget/GeckoRelativeLayout.java.in => mobile/android/base/widget/ThemedRelativeLayout.java.in
rename : mobile/android/base/widget/GeckoTextSwitcher.java.in => mobile/android/base/widget/ThemedTextSwitcher.java.in
rename : mobile/android/base/widget/GeckoTextView.java.in => mobile/android/base/widget/ThemedTextView.java.in
rename : mobile/android/base/widget/GeckoView.java.frag => mobile/android/base/widget/ThemedView.java.frag
This commit is contained in:
Michael Comella 2014-04-02 15:56:52 -07:00
Родитель 954372b90b
Коммит 4b04d5c772
20 изменённых файлов: 85 добавлений и 85 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
CLOBBER
Просмотреть файл

@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 988168 requires a clobber because of the location change for the linked libxul.
Bug 991256 requires a clobber because it renames generated mobile/android/base/widget files.

4
mobile/android/base/CustomEditText.java
Просмотреть файл

@ -5,14 +5,14 @@
package org.mozilla.gecko;
import org.mozilla.gecko.widget.GeckoEditText;
import org.mozilla.gecko.widget.ThemedEditText;
import android.content.Context;
import android.util.AttributeSet;
import android.view.KeyEvent;
import android.view.View;
public class CustomEditText extends GeckoEditText {
public class CustomEditText extends ThemedEditText {
private OnKeyPreImeListener mOnKeyPreImeListener;
private OnSelectionChangedListener mOnSelectionChangedListener;
private OnWindowFocusChangeListener mOnWindowFocusChangeListener;

14
mobile/android/base/moz.build
Просмотреть файл

@ -424,13 +424,13 @@ gbjar.generated_sources += [ android_package_dir + f for f in [
gbjar.generated_sources += [
'org/mozilla/gecko/AppConstants.java',
'org/mozilla/gecko/SysInfo.java',
'org/mozilla/gecko/widget/GeckoEditText.java',
'org/mozilla/gecko/widget/GeckoImageButton.java',
'org/mozilla/gecko/widget/GeckoImageView.java',
'org/mozilla/gecko/widget/GeckoLinearLayout.java',
'org/mozilla/gecko/widget/GeckoRelativeLayout.java',
'org/mozilla/gecko/widget/GeckoTextSwitcher.java',
'org/mozilla/gecko/widget/GeckoTextView.java',
'org/mozilla/gecko/widget/ThemedEditText.java',
'org/mozilla/gecko/widget/ThemedImageButton.java',
'org/mozilla/gecko/widget/ThemedImageView.java',
'org/mozilla/gecko/widget/ThemedLinearLayout.java',
'org/mozilla/gecko/widget/ThemedRelativeLayout.java',
'org/mozilla/gecko/widget/ThemedTextSwitcher.java',
'org/mozilla/gecko/widget/ThemedTextView.java',
]
if CONFIG['MOZ_CRASHREPORTER']:
gbjar.sources += [ 'CrashReporter.java' ]

28
mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
Просмотреть файл

@ -82,21 +82,21 @@
android:layout_toLeftOf="@id/menu"
android:layout_alignWithParentIfMissing="true"/>
<org.mozilla.gecko.widget.GeckoImageButton android:id="@+id/menu"
style="@style/UrlBar.ImageButton"
android:layout_width="56dip"
android:layout_alignParentRight="true"
android:contentDescription="@string/menu"
android:background="@drawable/action_bar_button"
android:visibility="gone"/>
<org.mozilla.gecko.widget.ThemedImageButton android:id="@+id/menu"
style="@style/UrlBar.ImageButton"
android:layout_width="56dip"
android:layout_alignParentRight="true"
android:contentDescription="@string/menu"
android:background="@drawable/action_bar_button"
android:visibility="gone"/>
<org.mozilla.gecko.widget.GeckoImageView android:id="@+id/menu_icon"
style="@style/UrlBar.ImageButton"
android:layout_alignLeft="@id/menu"
android:layout_alignRight="@id/menu"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:visibility="gone"/>
<org.mozilla.gecko.widget.ThemedImageView android:id="@+id/menu_icon"
style="@style/UrlBar.ImageButton"
android:layout_alignLeft="@id/menu"
android:layout_alignRight="@id/menu"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:visibility="gone"/>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"

14
mobile/android/base/resources/layout/browser_toolbar.xml
Просмотреть файл

@ -52,13 +52,13 @@
android:background="@drawable/shaped_button"
android:visibility="gone"/>
<org.mozilla.gecko.widget.GeckoImageView android:id="@+id/menu_icon"
style="@style/UrlBar.ImageButton"
android:layout_alignLeft="@id/menu"
android:layout_alignRight="@id/menu"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:visibility="gone"/>
<org.mozilla.gecko.widget.ThemedImageView android:id="@+id/menu_icon"
style="@style/UrlBar.ImageButton"
android:layout_alignLeft="@id/menu"
android:layout_alignRight="@id/menu"
android:gravity="center_vertical"
android:src="@drawable/menu_level"
android:visibility="gone"/>
<org.mozilla.gecko.toolbar.ShapedButton android:id="@+id/tabs"
style="@style/UrlBar.ImageButton"

24
mobile/android/base/resources/layout/tabs_counter.xml
Просмотреть файл

@ -3,15 +3,15 @@
- 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/. -->
<org.mozilla.gecko.widget.GeckoTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_margin="12dip"
android:paddingTop="2dip"
android:paddingLeft="4dip"
android:background="@drawable/tabs_count_foreground"
android:textAppearance="@style/TextAppearance.Micro"
android:textColor="#FF43484E"
android:textStyle="bold"
android:duplicateParentState="true"
android:gravity="center"/>
<org.mozilla.gecko.widget.ThemedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_margin="12dip"
android:paddingTop="2dip"
android:paddingLeft="4dip"
android:background="@drawable/tabs_count_foreground"
android:textAppearance="@style/TextAppearance.Micro"
android:textColor="#FF43484E"
android:textStyle="bold"
android:duplicateParentState="true"
android:gravity="center"/>

26
mobile/android/base/resources/layout/toolbar_display_layout.xml
Просмотреть файл

@ -25,19 +25,19 @@
android:contentDescription="@string/site_security"
android:visibility="gone"/>
<org.mozilla.gecko.widget.GeckoTextView android:id="@+id/url_bar_title"
style="@style/UrlBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/url_bar_title"
android:textColorHint="@color/url_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/url_bar_default_text"
android:layout_gravity="center_vertical"
gecko:autoUpdateTheme="false"/>
<org.mozilla.gecko.widget.ThemedTextView android:id="@+id/url_bar_title"
style="@style/UrlBar.Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1.0"
android:singleLine="true"
android:paddingRight="8dp"
android:textColor="@color/url_bar_title"
android:textColorHint="@color/url_bar_title_hint"
android:gravity="center_vertical|left"
android:hint="@string/url_bar_default_text"
android:layout_gravity="center_vertical"
gecko:autoUpdateTheme="false"/>
<org.mozilla.gecko.toolbar.PageActionLayout android:id="@+id/page_action_layout"
android:layout_width="wrap_content"

16
mobile/android/base/toolbar/BrowserToolbar.java
Просмотреть файл

@ -31,9 +31,9 @@ import org.mozilla.gecko.util.Clipboard;
import org.mozilla.gecko.util.GeckoEventListener;
import org.mozilla.gecko.util.HardwareUtils;
import org.mozilla.gecko.util.MenuUtils;
import org.mozilla.gecko.widget.GeckoImageButton;
import org.mozilla.gecko.widget.GeckoImageView;
import org.mozilla.gecko.widget.GeckoRelativeLayout;
import org.mozilla.gecko.widget.ThemedImageButton;
import org.mozilla.gecko.widget.ThemedImageView;
import org.mozilla.gecko.widget.ThemedRelativeLayout;
import android.content.Context;
import android.content.res.Resources;
@ -75,7 +75,7 @@ import android.widget.PopupWindow;
* as a set of listeners to allow {@code BrowserToolbar} users to react
* to state changes accordingly.
*/
public class BrowserToolbar extends GeckoRelativeLayout
public class BrowserToolbar extends ThemedRelativeLayout
implements Tabs.OnTabsChangedListener,
GeckoMenu.ActionItemBarPresenter,
GeckoEventListener {
@ -126,8 +126,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
private ToolbarProgressView mProgressBar;
private TabCounter mTabsCounter;
private GeckoImageButton mMenu;
private GeckoImageView mMenuIcon;
private ThemedImageButton mMenu;
private ThemedImageView mMenuIcon;
private LinearLayout mActionItemBar;
private MenuPopup mMenuPopup;
private List<View> mFocusOrder;
@ -202,8 +202,8 @@ public class BrowserToolbar extends GeckoRelativeLayout
mForward = (ImageButton) findViewById(R.id.forward);
setButtonEnabled(mForward, false);
mMenu = (GeckoImageButton) findViewById(R.id.menu);
mMenuIcon = (GeckoImageView) findViewById(R.id.menu_icon);
mMenu = (ThemedImageButton) findViewById(R.id.menu);
mMenuIcon = (ThemedImageView) findViewById(R.id.menu_icon);
mActionItemBar = (LinearLayout) findViewById(R.id.menu_items);
mHasSoftMenuButton = !HardwareUtils.hasMenuButton();

4
mobile/android/base/toolbar/ShapedButton.java
Просмотреть файл

@ -8,7 +8,7 @@ import org.mozilla.gecko.GeckoApplication;
import org.mozilla.gecko.LightweightTheme;
import org.mozilla.gecko.LightweightThemeDrawable;
import org.mozilla.gecko.R;
import org.mozilla.gecko.widget.GeckoImageButton;
import org.mozilla.gecko.widget.ThemedImageButton;
import android.content.Context;
import android.content.res.TypedArray;
@ -19,7 +19,7 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.StateListDrawable;
import android.util.AttributeSet;
public class ShapedButton extends GeckoImageButton
public class ShapedButton extends ThemedImageButton
implements CanvasDelegate.DrawManager {
protected final LightweightTheme mTheme;

4
mobile/android/base/toolbar/TabCounter.java
Просмотреть файл

@ -7,7 +7,7 @@ package org.mozilla.gecko.toolbar;
import org.mozilla.gecko.animation.Rotate3DAnimation;
import org.mozilla.gecko.R;
import org.mozilla.gecko.widget.GeckoTextSwitcher;
import org.mozilla.gecko.widget.ThemedTextSwitcher;
import android.content.Context;
import android.os.Build;
@ -20,7 +20,7 @@ import android.view.View;
import android.util.AttributeSet;
import android.widget.ViewSwitcher;
public class TabCounter extends GeckoTextSwitcher
public class TabCounter extends ThemedTextSwitcher
implements ViewSwitcher.ViewFactory {
private static final float CENTER_X = 0.5f;

10
mobile/android/base/toolbar/ToolbarDisplayLayout.java
Просмотреть файл

@ -16,8 +16,8 @@ import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.toolbar.BrowserToolbar.ForwardButtonAnimation;
import org.mozilla.gecko.util.StringUtils;
import org.mozilla.gecko.widget.GeckoLinearLayout;
import org.mozilla.gecko.widget.GeckoTextView;
import org.mozilla.gecko.widget.ThemedLinearLayout;
import org.mozilla.gecko.widget.ThemedTextView;
import org.json.JSONObject;
@ -62,7 +62,7 @@ import java.util.List;
* {@code ToolbarDisplayLayout} is meant to be owned by {@code BrowserToolbar}
* which is the main event bus for the toolbar subsystem.
*/
public class ToolbarDisplayLayout extends GeckoLinearLayout
public class ToolbarDisplayLayout extends ThemedLinearLayout
implements Animation.AnimationListener {
private static final String LOGTAG = "GeckoToolbarDisplayLayout";
@ -99,7 +99,7 @@ public class ToolbarDisplayLayout extends GeckoLinearLayout
private UIMode mUiMode;
private GeckoTextView mTitle;
private ThemedTextView mTitle;
private int mTitlePadding;
private ToolbarTitlePrefs mTitlePrefs;
private OnTitleChangeListener mTitleChangeListener;
@ -139,7 +139,7 @@ public class ToolbarDisplayLayout extends GeckoLinearLayout
LayoutInflater.from(context).inflate(R.layout.toolbar_display_layout, this);
mTitle = (GeckoTextView) findViewById(R.id.url_bar_title);
mTitle = (ThemedTextView) findViewById(R.id.url_bar_title);
mTitlePadding = mTitle.getPaddingRight();
final Resources res = getResources();

4
mobile/android/base/toolbar/ToolbarEditLayout.java
Просмотреть файл

@ -14,7 +14,7 @@ import org.mozilla.gecko.toolbar.BrowserToolbar.OnDismissListener;
import org.mozilla.gecko.toolbar.BrowserToolbar.OnFilterListener;
import org.mozilla.gecko.toolbar.ToolbarEditText.OnTextTypeChangeListener;
import org.mozilla.gecko.toolbar.ToolbarEditText.TextType;
import org.mozilla.gecko.widget.GeckoLinearLayout;
import org.mozilla.gecko.widget.ThemedLinearLayout;
import android.content.Context;
import android.util.AttributeSet;
@ -31,7 +31,7 @@ import android.widget.ImageButton;
* and its matching 'go' button which changes depending on the
* current type of text in the entry.
*/
public class ToolbarEditLayout extends GeckoLinearLayout {
public class ToolbarEditLayout extends ThemedLinearLayout {
private final ToolbarEditText mEditText;
private final ImageButton mGo;

2
mobile/android/base/widget/GeckoEditText.java.in → mobile/android/base/widget/ThemedEditText.java.in
Просмотреть файл

@ -1,3 +1,3 @@
#filter substitution
#define VIEWTYPE EditText
#include GeckoView.java.frag
#include ThemedView.java.frag

2
mobile/android/base/widget/GeckoImageButton.java.in → mobile/android/base/widget/ThemedImageButton.java.in
Просмотреть файл

@ -1,3 +1,3 @@
#filter substitution
#define VIEWTYPE ImageButton
#include GeckoView.java.frag
#include ThemedView.java.frag

2
mobile/android/base/widget/GeckoImageView.java.in → mobile/android/base/widget/ThemedImageView.java.in
Просмотреть файл

@ -1,3 +1,3 @@
#filter substitution
#define VIEWTYPE ImageView
#include GeckoView.java.frag
#include ThemedView.java.frag

2
mobile/android/base/widget/GeckoLinearLayout.java.in → mobile/android/base/widget/ThemedLinearLayout.java.in
Просмотреть файл

@ -1,3 +1,3 @@
#filter substitution
#define VIEWTYPE LinearLayout
#include GeckoView.java.frag
#include ThemedView.java.frag

2
mobile/android/base/widget/GeckoRelativeLayout.java.in → mobile/android/base/widget/ThemedRelativeLayout.java.in
Просмотреть файл

@ -1,3 +1,3 @@
#filter substitution
#define VIEWTYPE RelativeLayout
#include GeckoView.java.frag
#include ThemedView.java.frag

2
mobile/android/base/widget/GeckoTextSwitcher.java.in → mobile/android/base/widget/ThemedTextSwitcher.java.in
Просмотреть файл

@ -1,3 +1,3 @@
#filter substitution
#define VIEWTYPE TextSwitcher
#include GeckoView.java.frag
#include ThemedView.java.frag

2
mobile/android/base/widget/GeckoTextView.java.in → mobile/android/base/widget/ThemedTextView.java.in
Просмотреть файл

@ -1,3 +1,3 @@
#filter substitution
#define VIEWTYPE TextView
#include GeckoView.java.frag
#include ThemedView.java.frag

6
mobile/android/base/widget/GeckoView.java.frag → mobile/android/base/widget/ThemedView.java.frag
Просмотреть файл

@ -14,8 +14,8 @@ import android.graphics.drawable.ColorDrawable;
import android.util.AttributeSet;
import android.widget.@VIEWTYPE@;
public class Gecko@VIEWTYPE@ extends @VIEWTYPE@
implements LightweightTheme.OnChangeListener {
public class Themed@VIEWTYPE@ extends @VIEWTYPE@
implements LightweightTheme.OnChangeListener {
private final LightweightTheme mTheme;
private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
@ -31,7 +31,7 @@ public class Gecko@VIEWTYPE@ extends @VIEWTYPE@
private boolean mIsDark = false;
private boolean mAutoUpdateTheme = true;
public Gecko@VIEWTYPE@(Context context, AttributeSet attrs) {
public Themed@VIEWTYPE@(Context context, AttributeSet attrs) {
super(context, attrs);
mTheme = ((GeckoApplication) context.getApplicationContext()).getLightweightTheme();