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 1022472 - Remove margins on default home screen panels. r=wesj

Browse Source 
Relanding with follow-up: fix test with incorrect assumptions. r=mfinkle
This commit is contained in:
Richard Newman 2014-09-15 10:47:37 -07:00
parent 946317759d
commit ec672d04e3
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/resources/values-land/styles.xml
View File

@ -72,9 +72,7 @@
</style>
<style name="Widget.Home.HistoryListView">
<item name="android:paddingLeft">50dp</item>
<item name="android:paddingRight">100dp</item>
<item name="android:paddingTop">0dp</item>
<item name="topDivider">true</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
</style>

4
mobile/android/base/resources/values-large-land-v11/styles.xml
View File

@ -24,11 +24,7 @@
</style>
<style name="Widget.BookmarksListView" parent="Widget.HomeListView">
<item name="android:paddingTop">30dp</item>
<item name="android:paddingLeft">120dp</item>
<item name="android:paddingRight">120dp</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
<item name="topDivider">true</item>
</style>
<style name="Widget.TopSitesGridView" parent="Widget.GridView">

7
mobile/android/base/resources/values-large-v11/styles.xml
View File

@ -62,11 +62,7 @@
</style>
<style name="Widget.BookmarksListView" parent="Widget.HomeListView">
<item name="android:paddingTop">30dp</item>
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
<item name="topDivider">true</item>
</style>
<style name="Widget.TopSitesGridView" parent="Widget.GridView">
@ -78,6 +74,9 @@
</style>
<style name="Widget.TopSitesListView" parent="Widget.BookmarksListView">
<item name="android:paddingTop">30dp</item>
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>
<item name="topDivider">false</item>
</style>

9
mobile/android/base/resources/values-xlarge-land-v11/styles.xml
View File

@ -4,6 +4,12 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<resources>
<style name="Widget.TopSitesListView" parent="Widget.BookmarksListView">
<item name="android:paddingTop">30dp</item>
<item name="android:paddingLeft">120dp</item>
<item name="android:paddingRight">120dp</item>
<item name="topDivider">false</item>
</style>
<style name="Widget.TopSitesGridView" parent="Widget.GridView">
<item name="android:paddingLeft">55dp</item>
@ -14,9 +20,6 @@
</style>
<style name="Widget.Home.HistoryListView">
<item name="android:paddingLeft">50dp</item>
<item name="android:paddingRight">100dp</item>
<item name="android:paddingTop">30dp</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
<item name="topDivider">true</item>
</style>

10
mobile/android/base/resources/values-xlarge-v11/styles.xml
View File

@ -17,9 +17,6 @@
</style>
<style name="Widget.Home.HistoryListView">
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>
<item name="android:paddingTop">30dp</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
<item name="topDivider">true</item>
</style>
@ -30,4 +27,11 @@
<item name="android:paddingRight">212dp</item>
</style>
<style name="Widget.TopSitesListView" parent="Widget.BookmarksListView">
<item name="android:paddingTop">30dp</item>
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>
<item name="topDivider">false</item>
</style>
</resources>

6
mobile/android/base/resources/values/styles.xml
View File

@ -63,8 +63,10 @@
</style>
<style name="Widget.Home.HistoryListView">
<item name="android:paddingLeft">32dp</item>
<item name="android:paddingRight">32dp</item>
<item name="android:paddingTop">0dip</item>
<item name="android:paddingRight">0dip</item>
<item name="android:paddingLeft">0dip</item>
<item name="topDivider">true</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
</style>

10
mobile/android/base/tests/testBookmarkFolders.java
View File

@ -1,7 +1,7 @@
package org.mozilla.gecko.tests;
import org.mozilla.gecko.sync.Utils;
import org.mozilla.gecko.home.HomePager;
import org.mozilla.gecko.sync.Utils;
import android.content.ContentResolver;
import android.content.ContentValues;
@ -32,11 +32,9 @@ public class testBookmarkFolders extends AboutHomeTest {
// Verify the number of folders displayed in the Desktop Bookmarks folder is correct
ListView desktopFolderContent = findListViewWithTag(HomePager.LIST_TAG_BOOKMARKS);
ListAdapter adapter = desktopFolderContent.getAdapter();
if (mDevice.type.equals("tablet")) { // On tablets it's 4 folders and 1 view for top padding
mAsserter.is(adapter.getCount(), 5, "Checking that the correct number of folders is displayed in the Desktop Bookmarks folder");
} else { // On phones it's just the 4 folders
mAsserter.is(adapter.getCount(), 4, "Checking that the correct number of folders is displayed in the Desktop Bookmarks folder");
}
// Three folders and "Up to Bookmarks".
mAsserter.is(adapter.getCount(), 4, "Checking that the correct number of folders is displayed in the Desktop Bookmarks folder");
clickOnBookmarkFolder(StringHelper.TOOLBAR_FOLDER_LABEL);