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

Bug 936519 - Move general-purpose views to the widget package (r=mfinkle) 

--HG--
rename : mobile/android/base/AllCapsTextView.java => mobile/android/base/widget/AllCapsTextView.java
rename : mobile/android/base/AnimatedHeightLayout.java => mobile/android/base/widget/AnimatedHeightLayout.java
rename : mobile/android/base/CheckableLinearLayout.java => mobile/android/base/widget/CheckableLinearLayout.java
rename : mobile/android/base/ClickableWhenDisabledEditText.java => mobile/android/base/widget/ClickableWhenDisabledEditText.java
rename : mobile/android/base/FlowLayout.java => mobile/android/base/widget/FlowLayout.java
This commit is contained in:
Lucas Rocha 2013-11-11 18:41:12 +00:00
Родитель 30e5813e65
Коммит d2cef0903c
13 изменённых файлов: 56 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -5,14 +5,14 @@
package org.mozilla.gecko.home; package org.mozilla.gecko.home;
import org.mozilla.gecko.AnimatedHeightLayout;
import org.mozilla.gecko.FlowLayout;
import org.mozilla.gecko.R; import org.mozilla.gecko.R;
import org.mozilla.gecko.home.BrowserSearch.OnEditSuggestionListener; import org.mozilla.gecko.home.BrowserSearch.OnEditSuggestionListener;
import org.mozilla.gecko.home.BrowserSearch.OnSearchListener; import org.mozilla.gecko.home.BrowserSearch.OnSearchListener;
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
import org.mozilla.gecko.util.StringUtils; import org.mozilla.gecko.util.StringUtils;
import org.mozilla.gecko.widget.AnimatedHeightLayout;
import org.mozilla.gecko.widget.FaviconView; import org.mozilla.gecko.widget.FaviconView;
import org.mozilla.gecko.widget.FlowLayout;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;

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

@ -84,10 +84,8 @@ gbjar.sources += [
'ActivityHandlerHelper.java', 'ActivityHandlerHelper.java',
'AlertNotification.java', 'AlertNotification.java',
'AlignRightLinkPreference.java', 'AlignRightLinkPreference.java',
'AllCapsTextView.java',
'AndroidImport.java', 'AndroidImport.java',
'AndroidImportPreference.java', 'AndroidImportPreference.java',
'AnimatedHeightLayout.java',
'AppNotificationClient.java', 'AppNotificationClient.java',
'AutocompleteHandler.java', 'AutocompleteHandler.java',
'animation/AnimatorProxy.java', 'animation/AnimatorProxy.java',
@ -102,8 +100,6 @@ gbjar.sources += [
'CameraImageResultHandler.java', 'CameraImageResultHandler.java',
'CameraVideoResultHandler.java', 'CameraVideoResultHandler.java',
'CanvasDelegate.java', 'CanvasDelegate.java',
'CheckableLinearLayout.java',
'ClickableWhenDisabledEditText.java',
'ContactService.java', 'ContactService.java',
'ContextGetter.java', 'ContextGetter.java',
'CustomEditText.java', 'CustomEditText.java',
@ -124,7 +120,6 @@ gbjar.sources += [
'FilePickerResultHandler.java', 'FilePickerResultHandler.java',
'FilePickerResultHandlerSync.java', 'FilePickerResultHandlerSync.java',
'FindInPageBar.java', 'FindInPageBar.java',
'FlowLayout.java',
'FontSizePreference.java', 'FontSizePreference.java',
'FormAssistPopup.java', 'FormAssistPopup.java',
'ForwardButton.java', 'ForwardButton.java',
@ -297,11 +292,16 @@ gbjar.sources += [
'updater/UpdateServiceHelper.java', 'updater/UpdateServiceHelper.java',
'updater/UpdateService.java', 'updater/UpdateService.java',
'widget/ActivityChooserModel.java', 'widget/ActivityChooserModel.java',
'widget/AllCapsTextView.java',
'widget/AnimatedHeightLayout.java',
'widget/ButtonToast.java', 'widget/ButtonToast.java',
'widget/CheckableLinearLayout.java',
'widget/ClickableWhenDisabledEditText.java',
'widget/ArrowPopup.java', 'widget/ArrowPopup.java',
'widget/DateTimePicker.java', 'widget/DateTimePicker.java',
'widget/Divider.java', 'widget/Divider.java',
'widget/FaviconView.java', 'widget/FaviconView.java',
'widget/FlowLayout.java',
'widget/GeckoPopupMenu.java', 'widget/GeckoPopupMenu.java',
'widget/GeckoActionProvider.java', 'widget/GeckoActionProvider.java',
'widget/IconTabWidget.java', 'widget/IconTabWidget.java',

2
mobile/android/base/prompts/PromptInput.java
Просмотреть файл

@ -5,9 +5,9 @@
package org.mozilla.gecko.prompts; package org.mozilla.gecko.prompts;
import org.mozilla.gecko.AllCapsTextView;
import org.mozilla.gecko.util.GeckoEventResponder; import org.mozilla.gecko.util.GeckoEventResponder;
import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.gecko.widget.AllCapsTextView;
import org.mozilla.gecko.widget.DateTimePicker; import org.mozilla.gecko.widget.DateTimePicker;
import org.json.JSONArray; import org.json.JSONArray;

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

@ -3,16 +3,16 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - 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/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android" <org.mozilla.gecko.widget.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/client" android:id="@+id/client"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="@dimen/remote_tab_group_row_height" android:layout_height="@dimen/remote_tab_group_row_height"
style="@style/TabRowTextAppearance.Url" style="@style/TabRowTextAppearance.Url"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:paddingLeft="2dip" android:paddingLeft="2dip"
android:paddingRight="2dip" android:paddingRight="2dip"
android:textStyle="bold" android:textStyle="bold"
android:textSize="12sp" android:textSize="12sp"
android:singleLine="false" android:singleLine="false"
android:maxLines="2" android:maxLines="2"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>

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

@ -71,7 +71,7 @@
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="@string/crash_allow_contact2"/> android:text="@string/crash_allow_contact2"/>
<org.mozilla.gecko.ClickableWhenDisabledEditText <org.mozilla.gecko.widget.ClickableWhenDisabledEditText
android:id="@+id/email" android:id="@+id/email"
style="@style/CrashReporter.EditText" style="@style/CrashReporter.EditText"
android:layout_width="fill_parent" android:layout_width="fill_parent"

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

@ -3,14 +3,14 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - 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/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<org.mozilla.gecko.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android" <org.mozilla.gecko.widget.AllCapsTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/client" android:id="@+id/client"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="@dimen/remote_tab_group_row_height" android:layout_height="@dimen/remote_tab_group_row_height"
style="@style/TabRowTextAppearance.Url" style="@style/TabRowTextAppearance.Url"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
android:textStyle="bold" android:textStyle="bold"
android:textSize="14sp" android:textSize="14sp"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>

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

@ -14,17 +14,17 @@
android:minWidth="@dimen/favicon_bg" android:minWidth="@dimen/favicon_bg"
android:minHeight="@dimen/favicon_bg"/> android:minHeight="@dimen/favicon_bg"/>
<org.mozilla.gecko.FlowLayout android:id="@+id/suggestion_layout" <org.mozilla.gecko.widget.FlowLayout android:id="@+id/suggestion_layout"
android:layout_toRightOf="@id/suggestion_icon" android:layout_toRightOf="@id/suggestion_icon"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dip" android:layout_marginRight="10dip"
android:duplicateParentState="true"> android:duplicateParentState="true">
<include layout="@layout/suggestion_item" <include layout="@layout/suggestion_item"
android:id="@+id/suggestion_user_entered"/> android:id="@+id/suggestion_user_entered"/>
</org.mozilla.gecko.FlowLayout> </org.mozilla.gecko.widget.FlowLayout>
</merge> </merge>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<org.mozilla.gecko.CheckableLinearLayout <org.mozilla.gecko.widget.CheckableLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -50,4 +50,4 @@
android:focusable="false" android:focusable="false"
android:clickable="false"/> android:clickable="false"/>
</org.mozilla.gecko.CheckableLinearLayout> </org.mozilla.gecko.widget.CheckableLinearLayout>

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

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko; package org.mozilla.gecko.widget;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;

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

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko; package org.mozilla.gecko.widget;
import org.mozilla.gecko.animation.HeightChangeAnimation; import org.mozilla.gecko.animation.HeightChangeAnimation;

8
mobile/android/base/CheckableLinearLayout.java → mobile/android/base/widget/CheckableLinearLayout.java
Просмотреть файл

@ -1,4 +1,10 @@
package org.mozilla.gecko; /* 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.widget;
import org.mozilla.gecko.R;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;

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

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko; package org.mozilla.gecko.widget;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;

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

@ -2,7 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko; package org.mozilla.gecko.widget;
import org.mozilla.gecko.R;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;