Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 694684 - Change camel case and @android IDs [r=mfinkle]

Browse Source
This commit is contained in:
Brian Nicholson 2011-10-14 15:39:07 -07:00
parent c61e02b06b
commit 98022f4b12
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
embedding/android/AlertNotification.java
View File

@ -93,10 +93,10 @@ public class AlertNotification
try {
URL url = new URL(aIconUri.toString());
Bitmap bm = BitmapFactory.decodeStream(url.openStream());
view.setImageViewBitmap(R.id.notificationImage, bm);
view.setTextViewText(R.id.notificationTitle, mTitle);
view.setImageViewBitmap(R.id.notification_image, bm);
view.setTextViewText(R.id.notification_title, mTitle);
if (mText.length() > 0) {
view.setTextViewText(R.id.notificationText, mText);
view.setTextViewText(R.id.notification_text, mText);
}
contentView = view;
mNotificationManager.notify(mId, this);
@ -111,8 +111,8 @@ public class AlertNotification
int layout = aAlertText.length() > 0 ? R.layout.notification_progress_text : R.layout.notification_progress;
RemoteViews view = new RemoteViews(GeckoApp.mAppContext.getPackageName(), layout);
view.setImageViewResource(R.id.notificationImage, mIcon);
view.setTextViewText(R.id.notificationTitle, mTitle);
view.setImageViewResource(R.id.notification_image, mIcon);
view.setTextViewText(R.id.notification_title, mTitle);
contentView = view;
flags |= FLAG_ONGOING_EVENT | FLAG_ONLY_ALERT_ONCE;
@ -132,8 +132,8 @@ public class AlertNotification
if (mPrevAlertText.equals(text) && Math.abs(mPrevPercent - percent) < UPDATE_THRESHOLD)
return;
contentView.setTextViewText(R.id.notificationText, text);
contentView.setProgressBar(R.id.notificationProgressbar, (int)aProgressMax, (int)aProgress, false);
contentView.setTextViewText(R.id.notification_text, text);
contentView.setProgressBar(R.id.notification_progressbar, (int)aProgressMax, (int)aProgress, false);
// Update the notification
mNotificationManager.notify(mId, this);

2
embedding/android/BrowserToolbar.java
View File

@ -82,7 +82,7 @@ public class BrowserToolbar extends LinearLayout {
}
});
mFavicon = (ImageButton) findViewById(R.id.favimage);
mFavicon = (ImageButton) findViewById(R.id.favicon);
}
private void onAwesomeBarSearch() {

4
embedding/android/GeckoApp.java
View File

@ -1028,7 +1028,7 @@ abstract public class GeckoApp
mAppContext = this;
// setup gecko layout
mGeckoLayout = (RelativeLayout) findViewById(R.id.geckoLayout);
mGeckoLayout = (RelativeLayout) findViewById(R.id.gecko_layout);
mDoorHanger = new DoorHanger(this);
Tab tab = Tabs.getInstance().getSelectedTab();
@ -1074,7 +1074,7 @@ abstract public class GeckoApp
});
}
mMainLayout = (LinearLayout) findViewById(R.id.mainLayout);
mMainLayout = (LinearLayout) findViewById(R.id.main_layout);
mBrowserToolbar = (BrowserToolbar) findViewById(R.id.browser_toolbar);
//register for events

4
embedding/android/resources/layout/awesomebar_search.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/awesomeScreen"
android:id="@+id/awesome_screen"
style="@style/Screen">
<LinearLayout style="@style/AddressBar">
<EditText android:id="@+android:id/awesomebar_text"
<EditText android:id="@+id/awesomebar_text"
style="@style/AddressBar.URL"
android:background="@android:drawable/edit_text"
android:inputType="textUri"

2
embedding/android/resources/layout/browser_toolbar.xml
View File

@ -13,7 +13,7 @@
<Button android:id="@+id/tabs"
style="@style/AddressBar.Button.Left"/>
<ImageButton android:id="@+id/favimage"
<ImageButton android:id="@+id/favicon"
style="@style/AddressBar.ImageButton.Middle"
android:src="@drawable/favicon"/>

4
embedding/android/resources/layout/gecko_app.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+android:id/mainLayout"
android:id="@+id/main_layout"
style="@style/Screen">
<org.mozilla.gecko.BrowserToolbar android:id="@+id/browser_toolbar"
style="@style/BrowserToolbar"/>
<RelativeLayout android:id="@+android:id/geckoLayout"
<RelativeLayout android:id="@+id/gecko_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"/>

6
embedding/android/resources/layout/notification_icon_text.xml
View File

@ -9,12 +9,12 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/notificationImage"
<ImageView android:id="@+id/notification_image"
android:layout_width="25dp"
android:layout_height="25dp"
android:scaleType="fitCenter"/>
<TextView android:id="@+id/notificationTitle"
<TextView android:id="@+id/notification_title"
android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -26,7 +26,7 @@
</LinearLayout>
<TextView android:id="@+id/notificationText"
<TextView android:id="@+id/notification_text"
android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

8
embedding/android/resources/layout/notification_progress.xml
View File

@ -10,12 +10,12 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/notificationImage"
<ImageView android:id="@+id/notification_image"
android:layout_width="25dp"
android:layout_height="25dp"
android:scaleType="fitCenter"/>
<TextView android:id="@+id/notificationTitle"
<TextView android:id="@+id/notification_title"
android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -30,12 +30,12 @@
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView android:id="@+id/notificationText"
<TextView android:id="@+id/notification_text"
android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="3dp"/>
<ProgressBar android:id="@+id/notificationProgressbar"
<ProgressBar android:id="@+id/notification_progressbar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

8
embedding/android/resources/layout/notification_progress_text.xml
View File

@ -9,12 +9,12 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/notificationImage"
<ImageView android:id="@+id/notification_image"
android:layout_width="25dp"
android:layout_height="25dp"
android:scaleType="fitCenter"/>
<TextView android:id="@+id/notificationTitle"
<TextView android:id="@+id/notification_title"
android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -26,7 +26,7 @@
</LinearLayout>
<ProgressBar android:id="@+id/notificationProgressbar"
<ProgressBar android:id="@+id/notification_progressbar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="16dip"
@ -36,7 +36,7 @@
android:layout_marginRight="10dip"
android:layout_centerHorizontal="true" />
<TextView android:id="@+id/notificationText"
<TextView android:id="@+id/notification_text"
android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"