Bug 1014999 - Add remote tabs setup/verification panels for tablet. r=lucasr

This commit is contained in:
Michael Comella 2014-05-30 12:13:25 -07:00
Родитель d71e270204
Коммит eb4c1bcd28
4 изменённых файлов: 40 добавлений и 19 удалений

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

@ -51,4 +51,36 @@
<item name="android:paddingTop">30dp</item>
</style>
<!-- Remote tabs panel -->
<style name="RemoteTabsPanelChild" parent="RemoteTabsPanelChildBase">
<item name="android:paddingTop">32dp</item>
<!-- Additional spacing set via margins on RemoteTabsSection. -->
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">0dp</item>
</style>
<style name="RemoteTabsSection" parent="RemoteTabsSectionBase">
<!-- To override the values-land style. -->
</style>
<style name="RemoteTabsItem" parent="RemoteTabsItemBase">
<!-- To override the values-land style. -->
</style>
<style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
<item name="android:paddingTop">12dp</item>
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingLeft">36dp</item>
<item name="android:paddingRight">36dp</item>
<item name="android:textSize">16dp</item>
</style>
<style name="RemoteTabsItem.TextAppearance.Header.FXAccounts">
<item name="android:visibility">gone</item>
</style>
<style name="RemoteTabsItem.TextAppearance.Linkified.Resend">
<item name="android:layout_height">wrap_content</item>
</style>
</resources>

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

@ -452,11 +452,12 @@
<style name="RemoteTabsPanelChildBase">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:paddingTop">62dp</item>
<item name="android:orientation">vertical</item>
</style>
<style name="RemoteTabsPanelChild" parent="RemoteTabsPanelChildBase">
<item name="android:orientation">vertical</item>
<item name="android:paddingTop">62dp</item>
<!-- We set values in landscape. -->
</style>
<style name="RemoteTabsSectionBase">
@ -469,16 +470,16 @@
<!-- We set values in landscape. -->
</style>
<style name="RemoteTabsSection.Resend" parent="RemoteTabsSectionBase">
<!-- We set values in landscape. -->
</style>
<style name="RemoteTabsItem">
<style name="RemoteTabsItemBase">
<item name="android:layout_marginBottom">28dp</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
</style>
<style name="RemoteTabsItem" parent="RemoteTabsItemBase">
<!-- We set values in landscape. -->
</style>
<style name="RemoteTabsItem.ButtonBase">
<item name="android:background">@drawable/remote_tabs_setup_button_background</item>
<item name="android:textColor">#FFFEFF</item>

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

@ -11,7 +11,6 @@ import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.fxa.FirefoxAccounts;
import org.mozilla.gecko.fxa.activities.FxAccountCreateAccountActivity;
import org.mozilla.gecko.tabspanel.TabsPanel.PanelView;
import org.mozilla.gecko.util.HardwareUtils;
import android.content.Context;
import android.content.Intent;
@ -69,11 +68,6 @@ class RemoteTabsSetupPanel extends LinearLayout implements PanelView {
@Override
public void show() {
// We don't have a tablet implementation of this panel.
if (HardwareUtils.isTablet()) {
return;
}
setVisibility(View.VISIBLE);
}

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

@ -8,7 +8,6 @@ import org.mozilla.gecko.R;
import org.mozilla.gecko.fxa.FirefoxAccounts;
import org.mozilla.gecko.fxa.login.State;
import org.mozilla.gecko.tabspanel.TabsPanel.PanelView;
import org.mozilla.gecko.util.HardwareUtils;
import android.content.Context;
import android.util.AttributeSet;
@ -98,11 +97,6 @@ class RemoteTabsVerificationPanel extends LinearLayout implements PanelView {
@Override
public void show() {
// We don't have a tablet implementation of this panel.
if (HardwareUtils.isTablet()) {
return;
}
refresh();
setVisibility(View.VISIBLE);
}