M42 snap browser
Change-Id: If52741ad5e34241aa9f928244942a33a91610e58
diff --git a/.gitignore b/.gitignore
index 42a0adc..cea8212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
res/values/about.xml
+android-studio
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 87175fe..7a77506 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS" />
@@ -321,106 +322,128 @@
android:exported="false"
android:grantUriPermissions="true"/>
+ <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
+ android:value="3"/>
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService0"
+ android:process=":privileged_process0"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService1"
+ android:process=":privileged_process1"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService2"
+ android:process=":privileged_process2"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+
+ <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES"
+ android:value="20"/>
+
<service android:name="org.chromium.content.app.SandboxedProcessService0"
android:process=":sandboxed_process0"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService1"
android:process=":sandboxed_process1"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService2"
android:process=":sandboxed_process2"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService3"
android:process=":sandboxed_process3"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService4"
android:process=":sandboxed_process4"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService5"
android:process=":sandboxed_process5"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService6"
android:process=":sandboxed_process6"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService7"
android:process=":sandboxed_process7"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService8"
android:process=":sandboxed_process8"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService9"
android:process=":sandboxed_process9"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService10"
android:process=":sandboxed_process10"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService11"
android:process=":sandboxed_process11"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService12"
android:process=":sandboxed_process12"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService13"
android:process=":sandboxed_process13"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService14"
android:process=":sandboxed_process14"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService15"
android:process=":sandboxed_process15"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService16"
android:process=":sandboxed_process16"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService17"
android:process=":sandboxed_process17"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService18"
android:process=":sandboxed_process18"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService19"
android:process=":sandboxed_process19"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
</application>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19" />
@@ -428,4 +451,3 @@
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
</manifest>
-
diff --git a/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png
deleted file mode 100644
index c11b709..0000000
--- a/res/drawable-sw600dp-hdpi/ic_secure_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png
deleted file mode 100644
index a90425a..0000000
--- a/res/drawable-sw600dp-hdpi/ic_secure_partial_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png
deleted file mode 100644
index fac7629..0000000
--- a/res/drawable-sw600dp-mdpi/ic_secure_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png
deleted file mode 100644
index a7b6cf9..0000000
--- a/res/drawable-sw600dp-mdpi/ic_secure_partial_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png
deleted file mode 100644
index 1ce6c3f..0000000
--- a/res/drawable-sw600dp-xhdpi/ic_secure_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png b/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png
deleted file mode 100644
index 01feec8..0000000
--- a/res/drawable-sw600dp-xhdpi/ic_secure_partial_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-land/page_info.xml b/res/layout-land/page_info.xml
index f4397a5..efbbba5 100644
--- a/res/layout-land/page_info.xml
+++ b/res/layout-land/page_info.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
-
+
<!-- Title: -->
<TextView
android:id="@+id/title"
@@ -33,8 +33,8 @@
android:textColor="@color/white"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginTop="12dip"
android:layout_marginBottom="12dip" />
@@ -46,27 +46,27 @@
android:orientation="vertical">
<TableRow>
- <TextView
+ <TextView
android:id="@+id/address_header"
android:text="@string/page_info_address"
android:textSize="14sp"
android:textColor="@color/white"
- android:gravity="left"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip" />
-
+ android:gravity="start"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip" />
+
<TextView
android:id="@+id/address"
android:textSize="14sp"
android:textColor="@color/white"
- android:gravity="left"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="20dip"
+ android:gravity="start"
+ android:layout_marginStart="10dip"
+ android:layout_marginEnd="20dip"
android:layout_marginBottom="12dip" />
</TableRow>
</TableLayout>
-
+
</LinearLayout>
</ScrollView>
diff --git a/res/layout-port/autofill_settings_fragment.xml b/res/layout-port/autofill_settings_fragment.xml
index 0916dc6..d2463ba 100644
--- a/res/layout-port/autofill_settings_fragment.xml
+++ b/res/layout-port/autofill_settings_fragment.xml
@@ -17,9 +17,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingLeft="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:paddingRight="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout-sw600dp/snapshot_item.xml b/res/layout-sw600dp/snapshot_item.xml
index 0e28236..41b465b 100644
--- a/res/layout-sw600dp/snapshot_item.xml
+++ b/res/layout-sw600dp/snapshot_item.xml
@@ -32,16 +32,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/thumb"
- android:layout_alignLeft="@id/thumb"
- android:layout_alignRight="@id/thumb"
+ android:layout_alignStart="@id/thumb"
+ android:layout_alignEnd="@id/thumb"
android:background="@drawable/overlay_url_bookmark_widget_holo"
android:singleLine="true"
android:ellipsize="end"
android:textSize="12sp"
android:typeface="sans"
android:textColor="@android:color/white"
- android:paddingLeft="6dip"
- android:paddingRight="2dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="2dip"
android:gravity="center_vertical" />
<ImageView
android:id="@+id/divider"
@@ -49,16 +49,16 @@
android:layout_width="wrap_content"
android:layout_height="24dip"
android:layout_below="@+id/thumb"
- android:layout_alignLeft="@+id/thumb"
+ android:layout_alignStart="@+id/thumb"
android:scaleType="fitXY"
android:layout_marginTop="6dip" />
<TextView android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toRightOf="@id/divider"
+ android:layout_toEndOf="@id/divider"
android:layout_alignTop="@id/divider"
android:layout_alignBottom="@id/divider"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:gravity="center_vertical"
android:typeface="sans"
android:textSize="14sp"
@@ -68,8 +68,8 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/divider"
android:layout_alignBottom="@id/divider"
- android:layout_alignRight="@+id/thumb"
- android:paddingRight="2dip"
+ android:layout_alignEnd="@+id/thumb"
+ android:paddingEnd="2dip"
android:gravity="center_vertical"
android:typeface="sans"
android:textSize="14sp"
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 6cc6d0d..3595239 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -75,7 +75,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="0dip"
+ android:layout_marginStart="0dip"
android:visibility="gone" />
<com.android.browser.UrlInputView
@@ -90,8 +90,8 @@
android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
android:inputType="textUri"
android:lines="1"
- android:paddingLeft="4dip"
- android:paddingRight="0dip"
+ android:paddingStart="4dip"
+ android:paddingEnd="0dip"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml
index 9c4796d..434b2f1 100644
--- a/res/layout-sw600dp/title_bar_snapshot.xml
+++ b/res/layout-sw600dp/title_bar_snapshot.xml
@@ -24,12 +24,12 @@
android:src="@drawable/ic_suggest_history_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip" />
+ android:paddingStart="16dip" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:singleLine="true"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -38,7 +38,7 @@
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
- android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:singleLine="true"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -48,7 +48,7 @@
style="@style/NavButton"
android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_bookmarks"
- android:paddingRight="16dip"
+ android:paddingEnd="16dip"
android:scaleType="center"
android:src="@drawable/ic_deco_bookmarks_normal" />
</com.android.browser.SnapshotBar>
\ No newline at end of file
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index 28c9c60..cd6d22c 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,13 +14,13 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
- android:paddingRight="6dip"
- android:paddingLeft="6dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="6dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:gravity="center_vertical"
@@ -28,8 +28,8 @@
<ImageView android:id="@+id/favicon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="5dip"
- android:layout_marginRight="11dip"
+ android:layout_marginStart="5dip"
+ android:layout_marginEnd="11dip"
android:focusable="false"
android:src="@drawable/ic_action_bookmark_checked"
android:scaleType="fitCenter"
@@ -39,18 +39,18 @@
android:layout_height="wrap_content"
android:orientation="vertical"
>
- <TextView android:id="@+id/title"
+ <TextView android:id="@+id/title"
android:text="@string/add_new_bookmark"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textStyle="bold"
- android:layout_width="wrap_content"
+ android:textStyle="bold"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dip"
/>
- <TextView android:id="@+id/url"
+ <TextView android:id="@+id/url"
android:textAppearance="?android:attr/textAppearanceSmall"
android:maxLines="1"
- android:layout_width="wrap_content"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
diff --git a/res/layout/app_row.xml b/res/layout/app_row.xml
index 8ec5ec7..4a534e6 100644
--- a/res/layout/app_row.xml
+++ b/res/layout/app_row.xml
@@ -38,7 +38,7 @@
android:padding="4.0dip"
android:layout_width="48.0dip"
android:layout_height="48.0dip"
- android:layout_marginLeft="12.0dip"
+ android:layout_marginStart="12.0dip"
android:scaleType="fitCenter"
/>
<TextView
@@ -47,7 +47,7 @@
android:gravity="start|center"
android:layout_width="match_parent"
android:layout_height="48.0dip"
- android:layout_marginLeft="12.0dip"
+ android:layout_marginStart="12.0dip"
android:maxLines="2"
/>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/bookmark_group_view.xml b/res/layout/bookmark_group_view.xml
index cf4498e..e5bc767 100644
--- a/res/layout/bookmark_group_view.xml
+++ b/res/layout/bookmark_group_view.xml
@@ -17,7 +17,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="?android:attr/listPreferredItemHeightSmall"
+ android:layout_height="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:background="?android:attr/listChoiceBackgroundIndicator">
@@ -25,13 +25,13 @@
android:id="@+id/group_name"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="50dp"
+ android:paddingStart="50dp"
android:textAppearance="@style/BookmarkText"
android:gravity="center_vertical" />
<FrameLayout
android:id="@+id/crumb_holder"
- android:paddingLeft="16dp"
+ android:paddingStart="16dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout/bookmark_list.xml b/res/layout/bookmark_list.xml
index 4425a26..b4ff2d3 100644
--- a/res/layout/bookmark_list.xml
+++ b/res/layout/bookmark_list.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="@dimen/widgetItemMinHeight"
- android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:background="@drawable/bookmark_thumb_selector">
<ImageView
android:id="@+id/favicon"
@@ -34,9 +34,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_toRightOf="@id/favicon"
+ android:layout_toEndOf="@id/favicon"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:maxLines="1"
android:scrollHorizontally="true"
android:ellipsize="marquee"/>
diff --git a/res/layout/bookmark_sync_wizard_item.xml b/res/layout/bookmark_sync_wizard_item.xml
index 91ec3de..a9a7a2d 100644
--- a/res/layout/bookmark_sync_wizard_item.xml
+++ b/res/layout/bookmark_sync_wizard_item.xml
@@ -21,6 +21,6 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center_vertical"
android:checkMark="?android:attr/listChoiceIndicatorSingle"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="6dip"
/>
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index 64a0c9e..8b05b3b 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -18,8 +18,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="@dimen/combo_horizontalSpacing"
- android:paddingRight="@dimen/combo_horizontalSpacing"
+ android:paddingStart="@dimen/combo_horizontalSpacing"
+ android:paddingEnd="@dimen/combo_horizontalSpacing"
android:layout_margin="@dimen/combo_bookmark_thumbnail_margin"
android:background="@drawable/bookmark_thumb_selector"
android:orientation="vertical"
@@ -39,8 +39,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"
- android:paddingLeft="8dip"
- android:paddingRight="4dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="4dip"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:singleLine="true"
diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml
index df64fb9..42cc8de 100644
--- a/res/layout/bookmarks_drag_actionmode.xml
+++ b/res/layout/bookmarks_drag_actionmode.xml
@@ -22,27 +22,27 @@
android:divider="?android:attr/dividerVertical"
android:dividerPadding="12dp"
android:showDividers="middle"
- android:gravity="right"
+ android:gravity="end"
android:minHeight="?android:attr/actionBarSize">
<ImageView
android:id="@+id/open_context_menu_id"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:src="@drawable/ic_deco_favicon_normal" />
<ImageView
android:id="@+id/new_window_context_menu_id"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:src="@drawable/ic_action_add_tab" />
<ImageView
android:id="@+id/info"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:src="@drawable/ic_deco_info_normal" />
</LinearLayout>
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index 0bff98e..e9e377d 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -35,8 +35,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_marginRight="4dip"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="4dip"
android:layout_marginBottom="4dip"
android:src="@mipmap/ic_launcher_browser"
android:background="@drawable/bookmark_widget_thumb_selector"
diff --git a/res/layout/bookmarkthumbnailwidget_item.xml b/res/layout/bookmarkthumbnailwidget_item.xml
index 99df109..cc30557 100644
--- a/res/layout/bookmarkthumbnailwidget_item.xml
+++ b/res/layout/bookmarkthumbnailwidget_item.xml
@@ -32,8 +32,8 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@id/thumb"
android:background="@drawable/overlay_url_bookmark_widget_holo"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:layout_marginBottom="2dip">
<ImageView
android:id="@+id/favicon"
@@ -41,8 +41,8 @@
android:layout_width="@dimen/favicon_size"
android:layout_height="@dimen/favicon_size"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="4dip"
+ android:layout_marginEnd="8dip"
android:layout_marginTop="4dip"
android:layout_marginBottom="4dip"
android:scaleType="centerInside" />
diff --git a/res/layout/bookmarkthumbnailwidget_item_folder.xml b/res/layout/bookmarkthumbnailwidget_item_folder.xml
index 8722da6..300890a 100644
--- a/res/layout/bookmarkthumbnailwidget_item_folder.xml
+++ b/res/layout/bookmarkthumbnailwidget_item_folder.xml
@@ -32,8 +32,8 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@id/thumb"
android:background="@drawable/overlay_url_bookmark_widget_holo"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:layout_marginBottom="2dip">
<ImageView
android:id="@+id/favicon"
@@ -41,8 +41,8 @@
android:layout_width="@dimen/favicon_size"
android:layout_height="@dimen/favicon_size"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="4dip"
+ android:layout_marginEnd="8dip"
android:layout_marginTop="4dip"
android:layout_marginBottom="4dip"
android:scaleType="centerInside" />
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 8dfe1b4..cfaa81a 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -19,8 +19,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
+ android:paddingStart="5dip"
+ android:paddingEnd="5dip"
android:orientation="horizontal"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
>
@@ -44,14 +44,14 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
- android:paddingRight="8dip" />
+ android:paddingEnd="8dip" />
</LinearLayout>
<LinearLayout android:id="@+id/title_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
+ android:paddingStart="5dip"
+ android:paddingEnd="5dip"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
>
<TextView android:id="@+id/fake_title"
@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
- android:drawableLeft="@drawable/ic_action_bookmark_checked"
+ android:drawableStart="@drawable/ic_action_bookmark_checked"
android:text="@string/bookmark_this_page"
android:textAppearance="?android:attr/textAppearanceMedium" />
<View android:id="@+id/remove_divider"
@@ -75,7 +75,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/remove"
- android:drawableLeft="@drawable/ic_action_trash_normal"
+ android:drawableStart="@drawable/ic_action_trash_normal"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
@@ -93,8 +93,8 @@
android:stretchColumns="1"
android:shrinkColumns="1"
android:paddingTop="10dip"
- android:paddingLeft="20dip"
- android:paddingRight="20dip" >
+ android:paddingStart="20dip"
+ android:paddingEnd="20dip" >
<TableRow android:layout_marginBottom="10dip">
<TextView
android:id="@+id/titleText"
@@ -108,7 +108,7 @@
android:id="@+id/title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:inputType="textCapSentences|textNoSuggestions"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -129,7 +129,7 @@
android:id="@+id/address"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:hint="@string/http"
android:inputType="textUri"
android:ellipsize="end"
@@ -147,7 +147,7 @@
android:id="@+id/accounts"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:spinnerMode="dropdown"
/>
</TableRow>
@@ -163,7 +163,7 @@
android:id="@+id/folder"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:spinnerMode="dropdown"
/>
</TableRow>
@@ -179,8 +179,8 @@
<view class="com.android.browser.AddBookmarkPage$CustomListView"
android:id="@+id/list"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
@@ -189,7 +189,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_marginTop="16dip"
android:text="@string/no_subfolders"
android:textStyle="italic"
@@ -206,7 +206,7 @@
<Button android:id="@+id/cancel"
android:text="@string/do_not_save"
android:layout_width="0dip"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:layout_weight="1"
android:maxLines="2"
android:layout_height="wrap_content"
@@ -214,7 +214,7 @@
<Button android:id="@+id/OK"
android:text="@string/save"
android:layout_width="0dip"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:layout_weight="1"
android:maxLines="2"
android:layout_height="wrap_content"
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index 0e8051a..f117b05 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,8 +24,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/NavigationBarBackground"
- android:layout_gravity="right"
- android:gravity="right" >
+ android:layout_gravity="end"
+ android:gravity="end" >
<ImageButton
android:id="@+id/subwindow_close"
style="@style/NavButton"
diff --git a/res/layout/browser_tab_crash.xml b/res/layout/browser_tab_crash.xml
index d5ad343..846f7bf 100644
--- a/res/layout/browser_tab_crash.xml
+++ b/res/layout/browser_tab_crash.xml
@@ -54,8 +54,8 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:paddingLeft="10dp"
- android:paddingRight="10dp"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
android:paddingTop="20dp"
android:textSize="15dp"
android:textColor="@android:color/black"
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index 47d8081..2797239 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -37,8 +37,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
+ android:paddingStart="5dip"
+ android:paddingEnd="5dip"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
>
<TextView android:id="@+id/download_settings_title"
@@ -65,8 +65,8 @@
android:id="@+id/download_table_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="20dip"
- android:paddingRight="20dip"
+ android:paddingStart="20dip"
+ android:paddingEnd="20dip"
android:paddingTop="10dip"
android:shrinkColumns="1"
android:stretchColumns="1" >
@@ -140,7 +140,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/download_filesize"
- android:paddingLeft="10dip"
+ android:paddingStart="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="18sp" >
</TextView>
@@ -162,7 +162,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingLeft="10dip"
+ android:paddingStart="10dip"
android:text="@string/download_timeneeded"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="18sp" >
@@ -183,7 +183,7 @@
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:layout_weight="1"
android:maxLines="1"
android:text="@string/download_cancel" />
@@ -193,7 +193,7 @@
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:layout_weight="1"
android:maxLines="1"
android:text="@string/download_start" />
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 54de3cf..23fbc21 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,6 +32,6 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center_vertical"
- android:paddingLeft="6dip"
+ android:paddingStart="6dip"
android:minHeight="?android:attr/listPreferredItemHeight" />
</LinearLayout>
diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
index b42b3f9..9a345d6 100755
--- a/res/layout/geolocation_permissions_prompt.xml
+++ b/res/layout/geolocation_permissions_prompt.xml
@@ -34,8 +34,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
android:paddingTop="16dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -43,8 +43,8 @@
android:id="@+id/remember"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:text="@string/geolocation_permissions_prompt_remember"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -61,8 +61,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
+ android:paddingStart="2dip"
+ android:paddingEnd="2dip"
android:measureWithLargestChild="true"
android:background="@null">
<Button
diff --git a/res/layout/history_header.xml b/res/layout/history_header.xml
index f77a697..b1d17bd 100644
--- a/res/layout/history_header.xml
+++ b/res/layout/history_header.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,12 +14,12 @@
limitations under the License.
-->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingLeft="35dip"
+ android:paddingStart="35dip"
android:gravity="center_vertical"
android:background="?android:attr/activatedBackgroundIndicator"
/>
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index 031958f..cd236d5 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="12dip"
+ android:layout_marginStart="12dip"
android:background="@drawable/bookmark_list_favicon_bg"
android:scaleType="fitXY"
android:src="@drawable/ic_deco_favicon_normal" />
@@ -36,8 +36,8 @@
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical"
- android:paddingLeft="8dip"
- android:paddingRight="8dip">
+ android:paddingStart="8dip"
+ android:paddingEnd="8dip">
<TextView
android:id="@+id/title"
@@ -66,7 +66,7 @@
android:button="@drawable/ic_action_bookmark"
android:focusable="false"
android:paddingBottom="16dip"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="8dip"
android:paddingTop="16dip" />
</LinearLayout>
diff --git a/res/layout/http_authentication.xml b/res/layout/http_authentication.xml
index 856c45c..6be2f6f 100644
--- a/res/layout/http_authentication.xml
+++ b/res/layout/http_authentication.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,22 @@
android:orientation="vertical"
>
- <TextView
+ <TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/username"
android:layout_marginTop="12dip"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip" />
-
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip" />
+
<EditText
android:id="@+id/username_edit"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:scrollHorizontally="true"
android:inputType="text"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginBottom="12dip"
android:singleLine="true"
android:imeOptions="actionNext" />
@@ -44,17 +44,17 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/password"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip" />
-
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip" />
+
<EditText
android:id="@+id/password_edit"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:scrollHorizontally="true"
android:inputType="textPassword"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginBottom="12dip"
android:singleLine="true"
android:imeOptions="actionDone" />
diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml
index ebd39ef..cdee2fd 100644
--- a/res/layout/menu_item.xml
+++ b/res/layout/menu_item.xml
@@ -9,9 +9,7 @@
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingLeft="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:paddingRight="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/listChoiceBackgroundIndicator">
<TextView
android:id="@+id/menu_item_text"
diff --git a/res/layout/my_navigation_add_page.xml b/res/layout/my_navigation_add_page.xml
index 493a916..43d3e5f 100755
--- a/res/layout/my_navigation_add_page.xml
+++ b/res/layout/my_navigation_add_page.xml
@@ -37,8 +37,8 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="horizontal"
- android:paddingLeft="5dip"
- android:paddingRight="5dip" >
+ android:paddingStart="5dip"
+ android:paddingEnd="5dip" >
<TextView
android:id="@+id/dialog_title"
@@ -61,8 +61,8 @@
android:id="@+id/default_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
+ android:paddingStart="10dip"
+ android:paddingEnd="10dip"
android:paddingTop="10dip"
android:shrinkColumns="1"
android:stretchColumns="1" >
@@ -73,7 +73,7 @@
android:id="@+id/titleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="left"
+ android:gravity="start"
android:paddingTop="10dip"
android:text="@string/my_navigation_name"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -82,7 +82,7 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="10dip"
+ android:layout_marginStart="10dip"
android:inputType="textCapSentences"
android:selectAllOnFocus="true"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -96,7 +96,7 @@
android:id="@+id/addressText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="left"
+ android:gravity="start"
android:text="@string/my_navigation_address"
android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -104,7 +104,7 @@
android:id="@+id/address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="10dip"
+ android:layout_marginStart="10dip"
android:hint="@string/http"
android:inputType="textUri"
android:selectAllOnFocus="true"
@@ -135,7 +135,7 @@
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:layout_weight="1"
android:maxLines="2"
android:text="@string/do_not_save" />
@@ -145,7 +145,7 @@
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:layout_weight="1"
android:maxLines="2"
android:text="@string/save" />
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index a126732..c2f8f1a 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -28,7 +28,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/nav_tab_titleheight"
android:layout_gravity="center_horizontal"
- android:paddingLeft="8dip" >
+ android:paddingStart="8dip" >
<TextView
android:id="@+id/title"
android:layout_width="0dip"
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@string/accessibility_button_closetab"
- android:paddingRight="16dip"
+ android:paddingEnd="16dip"
android:src="@drawable/ic_action_close" />
</LinearLayout>
@@ -57,7 +57,7 @@
android:id="@+id/tab_view"
android:layout_width="@dimen/nav_tab_width"
android:layout_height="@dimen/nav_tab_height"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
+ android:paddingStart="2dip"
+ android:paddingEnd="2dip"
android:focusable="false" />
</LinearLayout>
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index bd34087..3ffa791 100644
--- a/res/layout/new_folder_layout.xml
+++ b/res/layout/new_folder_layout.xml
@@ -43,7 +43,7 @@
android:inputType="textCapSentences|textNoSuggestions"
android:background="@null"
android:gravity="center_vertical"
- android:paddingLeft="6dip"
+ android:paddingStart="6dip"
/>
<ImageView
android:id="@+id/close"
diff --git a/res/layout/page_info.xml b/res/layout/page_info.xml
index 7feb24e..e3b117c 100644
--- a/res/layout/page_info.xml
+++ b/res/layout/page_info.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,45 +24,45 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
-
+
<!-- Title: -->
<TextView
android:id="@+id/title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textStyle="bold"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginTop="12dip"
android:layout_marginBottom="12dip" />
-
+
<!-- Address: -->
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
-
- <TextView
+
+ <TextView
android:id="@+id/address_header"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/page_info_address"
- android:gravity="left"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:gravity="start"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginBottom="10dip" />
-
+
<TextView
android:id="@+id/address"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:gravity="left"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:gravity="start"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginBottom="12dip" />
-
+
</TableLayout>
-
+
</LinearLayout>
</ScrollView>
diff --git a/res/layout/preference_list_content.xml b/res/layout/preference_list_content.xml
index ad3d64e..1b2ba55 100644
--- a/res/layout/preference_list_content.xml
+++ b/res/layout/preference_list_content.xml
@@ -27,8 +27,8 @@
android:orientation="vertical"
android:layout_width="0px"
android:layout_height="match_parent"
- android:layout_marginRight="@dimen/preference_screen_side_margin_negative"
- android:layout_marginLeft="@dimen/preference_screen_side_margin"
+ android:layout_marginEnd="@dimen/preference_screen_side_margin_negative"
+ android:layout_marginStart="@dimen/preference_screen_side_margin"
android:layout_marginTop="32dp"
android:layout_marginBottom="32dp"
android:layout_weight="10">
@@ -54,8 +54,8 @@
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight="20"
- android:layout_marginLeft="@dimen/preference_screen_side_margin"
- android:layout_marginRight="@dimen/preference_screen_side_margin"
+ android:layout_marginStart="@dimen/preference_screen_side_margin"
+ android:layout_marginEnd="@dimen/preference_screen_side_margin"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="?android:attr/detailsElementBackground"
@@ -69,16 +69,16 @@
android:layout_width="match_parent"
android:paddingTop="16dip"
android:paddingBottom="8dip"
- android:gravity="center_vertical|left"
- android:layout_marginLeft="48dip"
- android:layout_marginRight="48dip"
+ android:gravity="center_vertical|start"
+ android:layout_marginStart="48dip"
+ android:layout_marginEnd="48dip"
/>
<ImageView
android:layout_width="match_parent"
android:layout_height="1dip"
- android:paddingLeft="32dip"
- android:paddingRight="32dip"
+ android:paddingStart="32dip"
+ android:paddingEnd="32dip"
android:src="#404040"
/>
<android.preference.PreferenceFrameLayout android:id="@+id/prefs"
diff --git a/res/layout/setup_autofill_dialog.xml b/res/layout/setup_autofill_dialog.xml
index 499c2a6..7f248fd 100644
--- a/res/layout/setup_autofill_dialog.xml
+++ b/res/layout/setup_autofill_dialog.xml
@@ -20,8 +20,8 @@
android:orientation="vertical"
android:paddingTop="9dip"
android:paddingBottom="3dip"
- android:paddingLeft="3dip"
- android:paddingRight="1dip">
+ android:paddingStart="3dip"
+ android:paddingEnd="1dip">
<TextView
android:text="@string/autofill_setup_dialog_message"
@@ -33,7 +33,7 @@
<CheckBox android:id="@+id/setup_autofill_dialog_disable_autofill"
android:text="@string/disable_autofill"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/res/layout/snapshot_item.xml b/res/layout/snapshot_item.xml
index 94a9898..0115356 100644
--- a/res/layout/snapshot_item.xml
+++ b/res/layout/snapshot_item.xml
@@ -32,36 +32,36 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/thumb"
- android:layout_alignLeft="@id/thumb"
- android:layout_alignRight="@id/thumb"
+ android:layout_alignStart="@id/thumb"
+ android:layout_alignEnd="@id/thumb"
android:background="@drawable/overlay_url_bookmark_widget_holo"
android:singleLine="true"
android:ellipsize="end"
android:textSize="14sp"
android:typeface="sans"
android:textColor="#AAAAAA"
- android:paddingLeft="6dip"
- android:paddingRight="2dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="2dip"
android:gravity="center_vertical" />
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/thumb"
- android:layout_alignLeft="@+id/thumb"
- android:layout_alignRight="@+id/thumb"
- android:layout_marginTop="5dip"
- android:paddingLeft="8dip"
+ android:layout_alignStart="@+id/thumb"
+ android:layout_alignEnd="@+id/thumb"
+ android:layout_marginTop="6dip"
+ android:paddingStart="8dip"
android:gravity="center_vertical"
- android:textColor="@color/black"
+ android:typeface="sans"
android:textSize="12sp"
- android:fontFamily="sans-serif-light"
+ android:textColor="#AAAAAA"
android:lines="2" />
<ImageView
android:id="@+id/divider"
android:src="?android:attr/dividerVertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignLeft="@+id/title"
+ android:layout_alignStart="@+id/title"
android:layout_alignTop="@+id/title"
android:layout_alignBottom="@+id/title"
android:scaleType="fitXY" />
diff --git a/res/layout/ssl_success.xml b/res/layout/ssl_success.xml
index 16f7f58..fb14852 100644
--- a/res/layout/ssl_success.xml
+++ b/res/layout/ssl_success.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
-
+
<TableRow>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="center"
android:src="@drawable/ic_dialog_browser_security_good"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:layout_marginBottom="12dip" />
-
+
<TextView
android:id="@+id/success"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:gravity="left"
+ android:gravity="start"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="10dip"
+ android:layout_marginEnd="20dip"
android:layout_marginBottom="12dip" />
</TableRow>
diff --git a/res/layout/ssl_warning.xml b/res/layout/ssl_warning.xml
index a54dfb8..9471943 100644
--- a/res/layout/ssl_warning.xml
+++ b/res/layout/ssl_warning.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,11 +19,11 @@
android:id="@+id/warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:drawableLeft="@drawable/ic_dialog_browser_security_bad"
+ android:drawableStart="@drawable/ic_dialog_browser_security_bad"
android:drawablePadding="6dip"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="12dip"
- android:layout_marginRight="12dip"
+ android:layout_marginStart="12dip"
+ android:layout_marginEnd="12dip"
android:minHeight="32dip"
android:gravity="center_vertical"
android:layout_marginBottom="4dip"
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index d0075f6..a8e9d1a 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -39,8 +39,8 @@
android:layout_height="wrap_content"
android:id="@+id/icon1"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="@dimen/suggest_item_padding"
- android:layout_marginRight="@dimen/suggest_item_padding" />
+ android:layout_marginStart="@dimen/suggest_item_padding"
+ android:layout_marginEnd="@dimen/suggest_item_padding" />
<LinearLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
android:scaleType="center"
android:src="@drawable/ic_action_querybuilder"
android:background="?android:attr/selectableItemBackground"
- android:paddingRight="@dimen/suggest_item_padding"
- android:paddingLeft="@dimen/suggest_item_padding"
+ android:paddingEnd="@dimen/suggest_item_padding"
+ android:paddingStart="@dimen/suggest_item_padding"
/>
</LinearLayout>
diff --git a/res/layout/website_settings.xml b/res/layout/swe_website_settings.xml
similarity index 100%
rename from res/layout/website_settings.xml
rename to res/layout/swe_website_settings.xml
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index f248938..5dde66a 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -36,8 +36,8 @@
android:id="@+id/favicon"
android:layout_width="20dip"
android:layout_height="20dip"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip" />
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip" />
<ImageView
android:id="@+id/lock"
android:layout_width="wrap_content"
@@ -48,8 +48,8 @@
android:layout_height="match_parent"
android:layout_width="0dip"
android:layout_weight="1.0"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="8dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white"
android:gravity="center_vertical"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index c412e11..142b73b 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
- android:layout_marginLeft="8dp"
+ android:layout_marginStart="8dp"
android:src="@drawable/ic_deco_incognito_normal"
android:visibility="gone" />
@@ -40,7 +40,7 @@
android:id="@+id/location_button"
style="@style/NavButton"
android:layout_width="wrap_content"
- android:paddingRight="2dp"
+ android:paddingEnd="2dp"
android:visibility="gone" />
<ImageView
@@ -48,8 +48,8 @@
android:layout_width="44dp"
android:layout_height="match_parent"
android:src="@drawable/ic_action_search_normal"
- android:paddingLeft="6dp"
- android:paddingRight="6dp"
+ android:paddingStart="6dp"
+ android:paddingEnd="6dp"
android:visibility="visible" />
<FrameLayout
@@ -63,8 +63,8 @@
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="6dip"
android:scaleType="fitCenter" />
<ImageView
@@ -81,8 +81,8 @@
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@string/accessibility_button_stop"
- android:paddingLeft="6dp"
- android:paddingRight="6dp"
+ android:paddingStart="6dp"
+ android:paddingEnd="6dp"
android:src="@drawable/ic_action_stop" />
<com.android.browser.UrlInputView
@@ -100,8 +100,8 @@
android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
android:inputType="textUri"
android:lines="1"
- android:paddingLeft="4dp"
- android:paddingRight="6dp"
+ android:paddingStart="4dp"
+ android:paddingEnd="6dp"
android:scrollHorizontally="true"
android:singleLine="true"
android:fontFamily="sans-serif-condensed"
@@ -112,7 +112,7 @@
style="@style/NavButton"
android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_voice"
- android:paddingRight="4dip"
+ android:paddingEnd="4dip"
android:src="@drawable/ic_action_microphone_normal"
android:visibility="gone" />
@@ -143,7 +143,7 @@
android:layout_gravity="center"
android:clickable="false"
android:paddingBottom="3dp"
- android:paddingRight="2dp"
+ android:paddingEnd="2dp"
android:textColor="#333"
android:textSize="13dp"
android:textStyle="bold" />
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index 13a35ac..7417606 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -23,13 +23,13 @@
android:src="@drawable/ic_suggest_history_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="8dip" />
+ android:paddingStart="8dip" />
<ImageView
android:id="@+id/favicon"
android:layout_width="52dip"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:scaleType="fitCenter" />
<FrameLayout
android:id="@+id/toggle_container"
@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingBottom="3dp"
- android:paddingRight="2dp"
+ android:paddingEnd="2dp"
android:clickable="false"
android:text="0" >
</TextView>
diff --git a/res/layout/website_settings_row.xml b/res/layout/website_settings_row.xml
index 3df63e2..19e998e 100644
--- a/res/layout/website_settings_row.xml
+++ b/res/layout/website_settings_row.xml
@@ -24,8 +24,8 @@
<ImageView android:id="@+id/icon"
android:layout_width="20dip"
android:layout_height="20dip"
- android:layout_marginLeft="18dip"
- android:layout_marginRight="18dip"
+ android:layout_marginStart="18dip"
+ android:layout_marginEnd="18dip"
android:layout_centerVertical="true"
android:background="@drawable/bookmark_list_favicon_bg"
android:padding="2dip" />
@@ -35,10 +35,10 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:gravity="center"
android:padding="0dip"
- android:layout_marginRight="2dip">
+ android:layout_marginEnd="2dip">
<ImageView android:id="@+id/location_icon"
android:layout_width="32dip"
@@ -55,15 +55,15 @@
android:layout_height="32dip"
android:padding="2dip"
android:layout_centerVertical="true"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toRightOf="@id/icon"
- android:layout_toLeftOf="@id/features"
+ android:layout_toEndOf="@id/icon"
+ android:layout_toStartOf="@id/features"
android:layout_centerVertical="true"
android:layout_alignWithParentIfMissing="true"
android:orientation="vertical">
diff --git a/res/layout/webview_preview.xml b/res/layout/webview_preview.xml
index b86de2b..57a904d 100644
--- a/res/layout/webview_preview.xml
+++ b/res/layout/webview_preview.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<LinearLayout
android:layout_width="wrap_content"
@@ -38,8 +38,8 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="8dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_below="@android:id/summary"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:minWidth="@dimen/preference_widget_width"
android:gravity="center"
android:orientation="vertical" />
@@ -76,8 +76,8 @@
android:layout_width="match_parent"
android:layout_height="180dp"
android:layout_below="@android:id/summary"
- android:layout_toRightOf="@android:id/widget_frame"
- android:layout_alignParentRight="true"
+ android:layout_toEndOf="@android:id/widget_frame"
+ android:layout_alignParentEnd="true"
android:textColor="@color/black"
android:background="@color/white"/>
diff --git a/res/layout/widget_account_selection.xml b/res/layout/widget_account_selection.xml
index 5dcd210..8d0181f 100644
--- a/res/layout/widget_account_selection.xml
+++ b/res/layout/widget_account_selection.xml
@@ -24,8 +24,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:fadingEdgeLength="16dip" />
<LinearLayout
android:layout_width="match_parent"
@@ -40,8 +40,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
+ android:paddingStart="2dip"
+ android:paddingEnd="2dip"
android:measureWithLargestChild="true"
android:background="@null">
<Button
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp-v17/styles.xml
similarity index 100%
rename from res/values-sw600dp/styles.xml
rename to res/values-sw600dp-v17/styles.xml
diff --git a/res/values/styles.xml b/res/values-v17/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to res/values-v17/styles.xml
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5b81380..efae93d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -145,7 +145,6 @@
<string name="ssl_certificate">"安全证书"</string>
<string name="ssl_certificate_is_valid">"该证书有效。"</string>
<string name="pref_memory_monitor">"开启内存监测"</string>
- <string name="pref_allow_media_downloads">"允许多媒体下载"</string>
<string name="version">"版本"</string>
<string name="max_url_character_limit_msg">"达到最大输入长度"</string>
<string name="pref_do_not_track">"不跟踪"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index ebbd5af..b39fd06 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -145,7 +145,6 @@
<string name="ssl_certificate">安全性憑證</string>
<string name="ssl_certificate_is_valid">此憑證有效。</string>
<string name="pref_memory_monitor">啟用記憶體監察器</string>
- <string name="pref_allow_media_downloads">"允許多媒體下載"</string>
<string-array name="pref_content_plugins_choices">
diff --git a/res/values/bools.xml b/res/values/bools.xml
index fe9086e..49870a6 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -40,8 +40,6 @@
<bool name="feature_title_in_URL_bar">false</bool>
<!-- Allow users to provide custom download path -->
<bool name="feature_custom_download_path">false</bool>
- <!-- Add 'Allow media downloads' menu item -->
- <bool name="feature_allow_media_downloads">false</bool>
<!-- Allow disabling saving history for non-incognito tabs -->
<bool name="feature_disable_history">false</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4d772f3..a7d700d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -323,8 +323,6 @@
<string name="pref_content_javascript">Enable JavaScript</string>
<!-- Settings label -->
<string name="pref_memory_monitor">Enable Memory Monitor</string>
- <!-- Settings label -->
- <string name="pref_allow_media_downloads">Allow Media Downloads</string>
<!-- Settings label -->
<string name="pref_content_open_in_background">Open in background</string>
<!-- Settings label -->
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index d65549d..6cdd04c 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -160,10 +160,6 @@
android:key="enable_javascript"
android:title="@string/pref_content_javascript" />
- <CheckBoxPreference
- android:key="allow_media_downloads"
- android:title="@string/pref_allow_media_downloads" />
-
<PreferenceScreen
android:key="download_path_setting_screen"
android:title="@string/pref_download_path_setting_screen_title"/>
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index da9ad63..4c17b8b 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -428,14 +428,9 @@
// container to the content view.
FrameLayout wrapper =
(FrameLayout) container.findViewById(R.id.webview_wrapper);
- ViewGroup parent = (ViewGroup) mainView.getParent();
- if (parent != wrapper) {
- if (parent != null) {
- parent.removeView(mainView);
- }
- wrapper.addView(mainView);
- }
- parent = (ViewGroup) container.getParent();
+ if (wrapper != mainView.getView().getParent())
+ wrapper.addView(mainView.getView());
+ ViewGroup parent = (ViewGroup) container.getParent();
if (parent != mContentView) {
if (parent != null) {
parent.removeView(container);
@@ -458,7 +453,7 @@
// needed by WebView.
FrameLayout wrapper =
(FrameLayout) container.findViewById(R.id.webview_wrapper);
- wrapper.removeView(mainView);
+ wrapper.removeView(mainView.getView());
mContentView.removeView(container);
mUiController.endActionMode();
mUiController.removeSubWindow(tab);
diff --git a/src/com/android/browser/Browser.java b/src/com/android/browser/Browser.java
index 4c1d9f2..bd2ac06 100644
--- a/src/com/android/browser/Browser.java
+++ b/src/com/android/browser/Browser.java
@@ -25,9 +25,12 @@
import android.util.Log;
import android.os.Process;
+import org.chromium.chrome.browser.ChromiumApplication;
+import org.chromium.chrome.browser.PKCS11AuthenticationManager;
+
import org.codeaurora.swe.Engine;
-public class Browser extends Application {
+public class Browser extends ChromiumApplication {
private final static String LOGTAG = "browser";
@@ -112,5 +115,28 @@
}
}
+
+ @Override
+ protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {
+ return null;
+ }
+
+ @Override
+ protected void openProtectedContentSettings() {
+ }
+
+ @Override
+ protected boolean areParentalControlsEnabled() {
+ return false;
+ }
+
+ @Override
+ public String getSettingsActivityName() {
+ return null;
+ }
+
+ @Override
+ public void initCommandLine() {
+ }
}
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 670849b..220566a 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -37,7 +37,7 @@
import android.view.ViewTreeObserver;
import android.view.Window;
-import com.google.common.annotations.VisibleForTesting;
+import org.chromium.base.VisibleForTesting;
import com.android.browser.R;
import com.android.browser.search.DefaultSearchEngine;
import com.android.browser.search.SearchEngine;
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 3fea1ed..ca6c0dc 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -62,7 +62,7 @@
import org.json.JSONException;
import org.json.JSONObject;
-import org.codeaurora.net.NetworkServices;
+//import org.codeaurora.net.NetworkServices;
interface BookmarksPageCallbacks {
// Return true if handled
@@ -435,7 +435,7 @@
lm.restartLoader(LOADER_ACCOUNTS, null, this);
//Notify about anticipated network activity
- NetworkServices.HintUpcomingUserActivity();
+ //NetworkServices.HintUpcomingUserActivity();
return mRoot;
}
diff --git a/src/com/android/browser/BrowserConfigBase.java b/src/com/android/browser/BrowserConfigBase.java
index a96e6ad..99b6456 100644
--- a/src/com/android/browser/BrowserConfigBase.java
+++ b/src/com/android/browser/BrowserConfigBase.java
@@ -43,6 +43,12 @@
abstract class BrowserConfigBase {
private static final String OVERRIDE_USER_AGENT = "user-agent";
+ private static final String OVERRIDE_MEDIA_DOWNLOAD = "media-download";
+ private static final String HTTP_HEADERS = "http-headers";
+ private static final String ENABLE_SWE = "enabled-swe";
+ private static final String ENABLE_TOP_CONTROLS = "enable-top-controls-position-calculation";
+ private static final String TOP_CONTROLS_HIDE_THRESHOLD = "top-controls-hide-threshold";
+ private static final String TOP_CONTROLS_SHOW_THRESHOLD = "top-controls-show-threshold";
private Context mContext;
public BrowserConfigBase(Context context) {
@@ -67,15 +73,31 @@
}
}
+ public void overrideMediaDownload() {
+ boolean defaultAllowMediaDownloadsValue = mContext.getResources().getBoolean(
+ R.bool.def_allow_media_downloads);
+ if (defaultAllowMediaDownloadsValue)
+ BrowserCommandLine.appendSwitchWithValue(OVERRIDE_MEDIA_DOWNLOAD, "1");
+ }
+
+ public void setExtraHTTPRequestHeaders() {
+ String headers = mContext.getResources().getString(
+ R.string.def_extra_http_headers);
+ if (!TextUtils.isEmpty(headers))
+ BrowserCommandLine.appendSwitchWithValue(HTTP_HEADERS, headers);
+ }
+
public void initCommandLineSwitches() {
//SWE-hide-title-bar - enable following flags
- BrowserCommandLine.appendSwitch("enable-top-controls-position-calculation");
- BrowserCommandLine.appendSwitchWithValue("top-controls-height", "52");
- BrowserCommandLine.appendSwitchWithValue("top-controls-show-threshold", "0.5");
- BrowserCommandLine.appendSwitchWithValue("top-controls-hide-threshold", "0.5");
+ BrowserCommandLine.appendSwitch(ENABLE_TOP_CONTROLS);
+ BrowserCommandLine.appendSwitchWithValue(TOP_CONTROLS_SHOW_THRESHOLD, "0.5");
+ BrowserCommandLine.appendSwitchWithValue(TOP_CONTROLS_HIDE_THRESHOLD, "0.5");
+ BrowserCommandLine.appendSwitch(ENABLE_SWE);
// Allow to override UserAgent
overrideUserAgent();
+ overrideMediaDownload();
+ setExtraHTTPRequestHeaders();
}
private String constructUserAgent(String userAgent) {
@@ -98,7 +120,6 @@
EXIT_DIALOG, /* Add 'Exit' menu item and show 'Minimize or quit' dialog */
TITLE_IN_URL_BAR, /* Display page title instead of url in URL bar */
CUSTOM_DOWNLOAD_PATH, /* Allow users to provide custom download path */
- ALLOW_MEDIA_DOWNLOADS, /* Add 'Allow media downloads' menu item */
DISABLE_HISTORY /* Allow disabling saving history for non-incognito tabs */
}
@@ -116,8 +137,6 @@
return mContext.getResources().getBoolean(R.bool.feature_title_in_URL_bar);
case CUSTOM_DOWNLOAD_PATH:
return mContext.getResources().getBoolean(R.bool.feature_custom_download_path);
- case ALLOW_MEDIA_DOWNLOADS:
- return mContext.getResources().getBoolean(R.bool.feature_allow_media_downloads);
case DISABLE_HISTORY:
return mContext.getResources().getBoolean(R.bool.feature_disable_history);
default:
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 9ba3c31..5bb085c 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -258,8 +258,6 @@
settings.setUseWideViewPort(isWideViewport());
settings.setDoNotTrack(doNotTrack());
settings.setMediaPlaybackRequiresUserGesture(false);
- settings.setAllowMediaDownloads(allowMediaDownloads());
- setExtraHTTPRequestHeaders(settings);
WebSettings settingsClassic = (WebSettings) settings;
settingsClassic.setHardwareAccelSkiaEnabled(isSkiaHardwareAccelerated());
@@ -284,12 +282,6 @@
settingsClassic.setLinkPrefetchEnabled(mLinkPrefetchAllowed);
}
- private void setExtraHTTPRequestHeaders(WebSettings settings){
- String headers = mContext.getResources().getString(R.string.def_extra_http_headers);
- if (!TextUtils.isEmpty(headers)){
- settings.setHTTPRequestHeaders(headers);
- }
- }
/**
* Syncs all the settings that have no UI
@@ -343,6 +335,7 @@
private void syncSharedSettings() {
mNeedsSharedSync = false;
CookieManager.getInstance().setAcceptCookie(acceptCookies());
+
}
private void syncManagedSettings() {
@@ -731,25 +724,6 @@
return mPrefs.getBoolean(PREF_ENABLE_MEMORY_MONITOR, true);
}
- public boolean allowMediaDownloads() {
- // Return false if preference is not exposed to user
- if (!BrowserConfig.getInstance(mContext)
- .hasFeature(BrowserConfig.Feature.ALLOW_MEDIA_DOWNLOADS))
- return false;
-
- // Otherwise, look at default value
- boolean defaultAllowMediaDownloadsValue = mController.getContext()
- .getResources().getBoolean(R.bool.def_allow_media_downloads);
-
- // If preference is not saved, save default value
- if (!mPrefs.contains(PREF_ALLOW_MEDIA_DOWNLOADS)){
- Editor edit = mPrefs.edit();
- edit.putBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, defaultAllowMediaDownloadsValue);
- edit.apply();
- }
-
- return mPrefs.getBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, defaultAllowMediaDownloadsValue);
- }
public boolean loadPageInOverviewMode() {
return mPrefs.getBoolean(PREF_LOAD_PAGE, true);
diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java
index 9215fe5..5255994 100644
--- a/src/com/android/browser/BrowserWebView.java
+++ b/src/com/android/browser/BrowserWebView.java
@@ -111,6 +111,8 @@
public void setTitleBar(TitleBar title) {
mTitleBar = title;
+ if (!mTitleBar.isFixed())
+ setTopControlsHeight(52);
}
// From TitleBarDelegate
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index dd3d76c..747b779 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -132,7 +132,7 @@
private static final String LOGTAG = "Controller";
private static final String SEND_APP_ID_EXTRA =
"android.speech.extras.SEND_APPLICATION_ID_EXTRA";
- private static final String INCOGNITO_URI = "browser:incognito";
+ private static final String INCOGNITO_URI = "chrome://incognito";
// Remind switch to data connection if wifi is unavailable
private static final int NETWORK_SWITCH_TYPE_OK = 1;
@@ -1406,6 +1406,7 @@
break;
}
getCurrentTopWebView().requestFocus();
+ getCurrentTopWebView().onActivityResult(requestCode, resultCode, intent);
}
/**
diff --git a/src/com/android/browser/EngineInitializer.java b/src/com/android/browser/EngineInitializer.java
index 6556abb..ef88458 100644
--- a/src/com/android/browser/EngineInitializer.java
+++ b/src/com/android/browser/EngineInitializer.java
@@ -45,7 +45,7 @@
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
-import com.google.common.annotations.VisibleForTesting;
+import org.chromium.base.VisibleForTesting;
public class EngineInitializer {
private final static String LOGTAG = "EngineInitializer";
@@ -247,6 +247,66 @@
}
+ private void completeInitializationAsynOnUiThread(final Context ctx) {
+ assert runningOnUiThread() : "Tried to initialize the engine on the wrong thread.";
+
+ if (!mInitializationCompleted) {
+ // TODO: Evaluate the benefit of async Engine.initialize()
+ Engine.StartupCallback callback =
+ new Engine.StartupCallback() {
+ @Override
+ public void onSuccess(boolean alreadyStarted) {
+ if (Looper.myLooper() == Looper.getMainLooper()) {
+ Log.e(LOGTAG, "SWE engine initialization success");
+ // Add the browser commandline options
+ BrowserConfig.getInstance(ctx).initCommandLineSwitches();
+
+ //Note: Only enable this for debugging.
+ if (BrowserCommandLine.hasSwitch(STRICT_MODE)) {
+ Log.v(LOGTAG, "StrictMode enabled");
+ StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+ .detectDiskReads()
+ .detectDiskWrites()
+ .detectNetwork()
+ .penaltyLog()
+ .build());
+ StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+ .detectLeakedSqlLiteObjects()
+ .detectLeakedClosableObjects()
+ .penaltyLog()
+ .penaltyDeath()
+ .build());
+ }
+
+ //Enable remote debugging by default
+ Engine.setWebContentsDebuggingEnabled(true);
+ mInitializationCompleted = true;
+ mLibraryLoaded = true;
+ BrowserSettings.getInstance().onEngineInitializationComplete();
+
+ if (mActivity != null && mNotifyActivity) {
+ mNotifyActivity = false;
+ postOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mActivity.onEngineInitializationComplete();
+ mActivityReady = true;
+ processPendingEvents();
+ }
+ });
+ }
+ }
+ }
+
+ @Override
+ public void onFailure() {
+ Log.e(LOGTAG, "SWE engine initialization failed");
+ }
+ };
+ Engine.initialize(ctx, callback);
+ }
+ }
+
private void processPendingEvents() {
assert runningOnUiThread() : "Tried to initialize the engine on the wrong thread.";
diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java
index eb9fe53..f6b37f5 100644
--- a/src/com/android/browser/PreferenceKeys.java
+++ b/src/com/android/browser/PreferenceKeys.java
@@ -40,7 +40,6 @@
static final String PREF_DEFAULT_TEXT_ENCODING = "default_text_encoding";
static final String PREF_ENABLE_JAVASCRIPT = "enable_javascript";
static final String PREF_ENABLE_MEMORY_MONITOR = "enable_memory_monitor";
- static final String PREF_ALLOW_MEDIA_DOWNLOADS = "allow_media_downloads";
static final String PREF_LOAD_PAGE = "load_page";
static final String PREF_OPEN_IN_BACKGROUND = "open_in_background";
static final String PREF_RESET_DEFAULT_PREFERENCES = "reset_default_preferences";
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index c7b8ea7..0a23205 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -219,7 +219,7 @@
PageState(Context c, boolean incognito) {
mIncognito = incognito;
if (mIncognito) {
- mOriginalUrl = mUrl = "browser:incognito";
+ mOriginalUrl = mUrl = "chrome://incognito";
mTitle = c.getString(R.string.new_incognito_tab);
} else {
mOriginalUrl = mUrl = "";
@@ -670,7 +670,7 @@
public WebResourceResponse shouldInterceptRequest(WebView view,
String url) {
//intercept if opening a new incognito tab - show the incognito welcome page
- if (url.startsWith("browser:incognito")) {
+ if (url.startsWith("chrome://incognito")) {
Resources resourceHandle = mContext.getResources();
InputStream inStream = resourceHandle.openRawResource(
com.android.browser.R.raw.incognito_mode_start_page);
@@ -702,6 +702,24 @@
super.onUnhandledKeyEvent(view, event);
}
}
+ //SWE-download-file
+ @Override
+ public void onDownloadStart(String url,
+ String userAgent,
+ String contentDisposition,
+ String mimeType,
+ long contentLength) {
+ if (mDownloadListener != null) {
+ if (mDownloadListener instanceof BrowserDownloadListener) {
+ ((BrowserDownloadListener) mDownloadListener).onDownloadStart(url,
+ userAgent, contentDisposition, mimeType, contentLength);
+ } else {
+ mDownloadListener.onDownloadStart(url, userAgent,
+ contentDisposition, mimeType, contentLength);
+ }
+ }
+ }
+ //SWE-download-file
};
private void syncCurrentState(WebView view, String url) {
@@ -1578,7 +1596,7 @@
if (mMainView.hasCrashed()) {
// Reload if render process has crashed. This is done here so that
// setFocus call sends wasShown message to correct render process.
- mMainView.reload();
+ mMainView.setNeedsReload(true);
}
setupHwAcceleration(mMainView);
mMainView.onResume();
diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index c327fdc..4d3dee4 100755
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -47,7 +47,7 @@
static final Pattern ACCEPTED_URI_SCHEMA = Pattern.compile(
"(?i)" + // switch on case insensitive matching
"(" + // begin group for schema
- "(?:http|https|file):\\/\\/" +
+ "(?:http|https|file|chrome):\\/\\/" +
"|(?:inline|data|about|javascript):" +
")" +
"(.*)" );
diff --git a/src/com/android/browser/appmenu/AppMenuHandler.java b/src/com/android/browser/appmenu/AppMenuHandler.java
index 94a429a..dd1c1af 100644
--- a/src/com/android/browser/appmenu/AppMenuHandler.java
+++ b/src/com/android/browser/appmenu/AppMenuHandler.java
@@ -15,7 +15,7 @@
import android.view.View;
import android.widget.PopupMenu;
-import com.google.common.annotations.VisibleForTesting;
+import org.chromium.base.VisibleForTesting;
import java.util.ArrayList;
diff --git a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
index 5edf8e6..4c715ce 100644
--- a/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
+++ b/src/com/android/browser/preferences/AdvancedPreferencesFragment.java
@@ -83,10 +83,6 @@
// Below are preferences for carrier specific features
PreferenceScreen contentSettingsPrefScreen =
(PreferenceScreen) mFragment.findPreference("content_settings");
- if (!BrowserConfig.getInstance(mFragment.getActivity().getApplicationContext())
- .hasFeature(BrowserConfig.Feature.ALLOW_MEDIA_DOWNLOADS))
- contentSettingsPrefScreen.removePreference(contentSettingsPrefScreen
- .findPreference(PreferenceKeys.PREF_ALLOW_MEDIA_DOWNLOADS));
if (!BrowserConfig.getInstance(mFragment.getActivity().getApplicationContext())
.hasFeature(BrowserConfig.Feature.CUSTOM_DOWNLOAD_PATH)) {
diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index 9fe18c5..fb96645 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -278,6 +278,13 @@
askForGeolocation(sites);
}
});
+
+
+ //SWETODO: REMOVE code below be after WebStorage getOrigins Method is Functional
+ Map<String, Site> sites = new HashMap<String, Site>();
+ askForGeolocation(sites);
+
+
}
public void askForGeolocation(final Map<String, Site> sites) {
@@ -737,7 +744,7 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.website_settings, container, false);
+ View view = inflater.inflate(R.layout.swe_website_settings, container, false);
Bundle args = getArguments();
if (args != null) {
mSite = (Site) args.getParcelable(EXTRA_SITE);
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index 0a30853..58aa1a7 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -58,7 +58,7 @@
import com.android.browser.platformsupport.BrowserContract.SyncState;
import com.android.browser.platformsupport.SyncStateContentProviderHelper;
import com.android.browser.widget.BookmarkThumbnailWidgetProvider;
-import com.google.common.annotations.VisibleForTesting;
+import org.chromium.base.VisibleForTesting;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/src_system/AndroidManifest.xml b/src_system/AndroidManifest.xml
index f7b1578..ff288f8 100644
--- a/src_system/AndroidManifest.xml
+++ b/src_system/AndroidManifest.xml
@@ -33,6 +33,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.SEND_DOWNLOAD_COMPLETED_INTENTS" />
@@ -316,106 +317,137 @@
android:exported="false"
android:grantUriPermissions="true"/>
+
+ <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
+ android:value="3"/>
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService0"
+ android:process=":privileged_process0"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService1"
+ android:process=":privileged_process1"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+ <service android:name="org.chromium.content.app.PrivilegedProcessService2"
+ android:process=":privileged_process2"
+ android:isolatedProcess="false"
+ android:exported="false" />
+
+
+ <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES"
+ android:value="20"/>
+
<service android:name="org.chromium.content.app.SandboxedProcessService0"
android:process=":sandboxed_process0"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService1"
android:process=":sandboxed_process1"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService2"
android:process=":sandboxed_process2"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService3"
android:process=":sandboxed_process3"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService4"
android:process=":sandboxed_process4"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService5"
android:process=":sandboxed_process5"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService6"
android:process=":sandboxed_process6"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService7"
android:process=":sandboxed_process7"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService8"
android:process=":sandboxed_process8"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService9"
android:process=":sandboxed_process9"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService10"
android:process=":sandboxed_process10"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService11"
android:process=":sandboxed_process11"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService12"
android:process=":sandboxed_process12"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService13"
android:process=":sandboxed_process13"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService14"
android:process=":sandboxed_process14"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService15"
android:process=":sandboxed_process15"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService16"
android:process=":sandboxed_process16"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService17"
android:process=":sandboxed_process17"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService18"
android:process=":sandboxed_process18"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
<service android:name="org.chromium.content.app.SandboxedProcessService19"
android:process=":sandboxed_process19"
- android:permission="org.chromium.content_shell.permission.SANDBOX"
android:isolatedProcess="true"
android:exported="false" />
+
+ <!-- Provider for FileProvider. -->
+ <provider android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.android.browser.FileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
</application>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="19" />
diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index daf6ea3..6bf96c9 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -4,28 +4,17 @@
'target_name': 'swe_android_browser_apk',
'type': 'none',
'dependencies': [
- 'swe_engine_java',
- 'swe_android_browser_paks',
- 'android-support-v13',
- '<@(libnetxt_dependencies)',
- '<@(libsweadrenoext_dependencies)',
- 'fast_webview_java',
+ 'swe_chrome_engine',
+ #'android-support-v13',
],
'variables': {
'apk_name': 'SWE_AndroidBrowser',
'manifest_package_name': 'com.android.browser',
- 'app_manifest_version_name': '<!(../swe/browser/tools/generate_about.sh --quiet --name --about)',
- 'app_manifest_version_code': '<!(../swe/browser/tools/generate_about.sh --quiet --code)',
+ 'native_lib_version_name': '<(version_full)',
+ #'package_name': 'swe_android_browser_apk',
'java_in_dir': '.',
- 'resource_dir': '../../swe/browser/res',
+ 'resource_dir': '../browser/res',
'assets_dir': '../../swe/browser/assets',
- 'native_lib_target': 'libswewebviewchromium',
- 'additional_native_libs': [
- '<@(libnetxt_native_libs)',
- '<@(libsweadrenoext_native_libs)'],
- 'additional_input_paths': [
- '<!@pymod_do_main(swe_repack_locales -i -p <(OS) -g <(SHARED_INTERMEDIATE_DIR) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
- ],
'conditions': [
['icu_use_data_file_flag==1', {
'additional_input_paths': [
@@ -33,20 +22,25 @@
],
}],
],
+ 'native_lib_target': 'libchromeshell',
+ 'app_manifest_version_name': '<!(../swe/browser/tools/generate_about.sh --quiet --name --about)',
+ 'app_manifest_version_code': '<!(../swe/browser/tools/generate_about.sh --quiet --code)',
+ #'additional_native_libs': [
+ # '<@(libnetxt_native_libs)',
+ # ],
+ 'additional_input_paths': [
+ '<@(chrome_android_pak_output_resources)',
+ ],
'override_package_name': 'com.android.swe.browser',
'android_manifest_path': '../../swe/browser/AndroidManifest.xml',
'additional_src_dirs': ['<(DEPTH)/swe/browser/src_standalone/com/android/browser'],
-
},
+
'copies': [
{
'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/assets/',
- 'conditions': [
- ['icu_use_data_file_flag==1', {
- 'files': [
- '<(PRODUCT_DIR)/icudtl.dat',
- ],
- }],
+ 'files': [
+ '<@(chrome_android_pak_input_resources)',
],
},
{
@@ -60,83 +54,5 @@
],
'includes': [ '../../build/java_apk.gypi' ],
},
- {
- 'target_name': 'swe_android_browser_apk_java',
- 'type': 'none',
- 'dependencies': [
- 'swe_android_browser_apk',
- ],
- 'includes': [ '../../build/apk_fake_jar.gypi' ],
- },
- {
- 'target_name': 'swe_android_browser_paks',
- 'type': 'none',
- 'dependencies': [
- '<(DEPTH)/components/components_strings.gyp:components_strings',
- '<(DEPTH)/net/net.gyp:net_resources',
- '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
- '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
- '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
- '<(DEPTH)/content/content_resources.gyp:content_resources',
- '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
- '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
- ],
- 'variables': {
- 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
- },
- 'actions': [
- {
- 'action_name': 'repack_non_locale_paks',
- 'variables': {
- # pak_inputs should be in sync with pak_inputs in the
- # repack_android_webview_pack action within android_webview.gyp
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
- ],
- },
- 'inputs': [
- '<(repack_path)',
- '<@(pak_inputs)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/swe_android_browser_apk/assets/webviewchromium.pak',
- ],
- 'action': ['python', '<(repack_path)', '<@(_outputs)',
- '<@(pak_inputs)'],
- },
- {
- 'action_name': 'repack_locale_paks',
- 'variables': {
- 'repack_extra_flags%': [],
- 'repack_output_dir%': '<(PRODUCT_DIR)/swe_android_browser_apk/assets',
- 'repack_locales_cmd': ['python', '<(DEPTH)/swe/tools/build/swe_repack_locales.py'],
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/android_webview',
- },
- 'inputs': [
- '../tools/build/swe_repack_locales.py',
- '<!@pymod_do_main(swe_repack_locales -i -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(repack_extra_flags) <(locales))',
- ],
- 'outputs': [
- '<!@pymod_do_main(swe_repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(locales))',
- ],
- 'action': [
- '<@(repack_locales_cmd)',
- '-p', '<(OS)',
- '-g', '<(grit_out_dir)',
- '-s', '<(SHARED_INTERMEDIATE_DIR)',
- '-x', '<(repack_output_dir)/.',
- '<@(repack_extra_flags)',
- '<@(locales)',
- ],
- },
- ],
- },
],
}
diff --git a/swe_res.gypi b/swe_res.gypi
new file mode 100644
index 0000000..ce6e6ee
--- /dev/null
+++ b/swe_res.gypi
@@ -0,0 +1,175 @@
+{
+ 'targets' : [
+ {
+ 'target_name': 'swe_res',
+ 'type': 'none',
+ 'dependencies': [
+ 'swe_android_browser_apk',
+ ],
+ 'variables': {
+ 'conditions': [
+ ['target_arch=="arm64"', {
+ 'arm_dir': '../../libs/arm64-v8a',
+ }, {
+ 'arm_dir': '../../libs/armeabi-v7a',
+ }],
+ ],
+ },
+ 'copies' : [
+ #{
+ #TODO: FIX SWE_ENGINE.jar
+ #'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/jar/',
+ #'files': [
+ # '<(PRODUCT_DIR)/lib.java/swe_engine.jar'
+ #],
+ #},
+ {
+ 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/assets',
+ 'files': [
+ '<@(chrome_android_pak_input_resources)',
+ ],
+ 'conditions': [
+ ['icu_use_data_file_flag==1', {
+ 'files': [
+ '<(PRODUCT_DIR)/icudtl.dat',
+ ],
+ }],
+ ],
+ },
+
+ #ui res
+ {
+ 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/ui_res/',
+ 'files': [
+ '<(PRODUCT_DIR)/res.java/ui_java.zip',
+ '<(PRODUCT_DIR)/res.java/ui_strings_grd.zip',
+ ],
+ },
+ #content res
+ {
+ 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/content_res/',
+ 'files': [
+ '<(PRODUCT_DIR)/res.java/content_java.zip',
+ '<(PRODUCT_DIR)/res.java/content_strings_grd.zip',
+ ],
+ },
+ #swe_res.
+ {
+ 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/',
+ 'files': [
+ '<(PRODUCT_DIR)/res.java/swe_chrome_engine.zip',
+ ],
+ },
+ #chrome_res.
+ {
+ 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/chrome_res/',
+ 'files': [
+ '<(PRODUCT_DIR)/res.java/chrome_java.zip',
+ ],
+ },
+ #android_support_v7_res.
+ {
+ 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/android_support_v7_res/',
+ 'files': [
+ '<(PRODUCT_DIR)/res.java/android_support_v7_appcompat_javalib.zip',
+ ],
+ },
+ ],
+ 'actions': [
+ {
+ 'action_name': 'create_lib_projects',
+ 'inputs': [ '<(DEPTH)/swe/tools/createAppRes.py',
+ '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/content_res/project.properties',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/content_res/AndroidManifest.xml',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/ui_res/project.properties',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/ui_res/AndroidManifest.xml',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/project.properties',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/AndroidManifest.xml',
+ ],
+ 'action': ['python', '<(DEPTH)/swe/tools/createAppRes.py',
+ '<(DEPTH)/swe/tools/createAppResources.sh',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/'],
+ },
+ {
+ 'action_name': 'merge_ui_res',
+ 'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/ui_res/res/values/strings.xml'],
+ 'action': ['python', '<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/res.java/ui_java.zip',
+ '<(PRODUCT_DIR)/res.java/ui_strings_grd.zip',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/ui_res/res/',
+ ],
+ 'message': 'Merging UI Resources'
+ },
+ {
+ 'action_name': 'merge_content_res',
+ 'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/content_res/res/values/strings.xml'],
+ 'action': ['python', '<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/res.java/content_java.zip',
+ '<(PRODUCT_DIR)/res.java/content_strings_grd.zip',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/content_res/res/',
+ ],
+ 'message': 'Merging Content Resources'
+ },
+ {
+ 'action_name': 'merge_swe_res',
+ 'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/res/values/strings.xml'],
+ 'action': ['python', '<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/res.java/swe_chrome_engine.zip',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/res/',
+ ],
+ 'message': 'Merging SWE Resources'
+ },
+ {
+ 'action_name': 'merge_chrome_res',
+ 'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/chrome_res/res/values/strings.xml'],
+ 'action': ['python', '<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/res.java/chrome_java.zip',
+ '<(PRODUCT_DIR)/res.java/chrome_strings_grd.zip',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/chrome_res/res/',
+ ],
+ 'message': 'Merging SWE Resources'
+ },
+ {
+ 'action_name': 'merge_android_support_v7_res',
+ 'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+ ],
+ 'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/android_support_res/res/values/strings.xml'],
+ 'action': ['python', '<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/res.java/android_support_v7_appcompat_javalib.zip',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/android_support_res/res/',
+ ],
+ 'message': 'Merging SWE Resources'
+ },
+ {
+ 'action_name': 'merge_swe_libs',
+ 'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
+ '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libswev8.so',
+ ],
+ 'action': ['python', '<(DEPTH)/swe/tools/copy.py',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/libs/<(arm_dir)',
+ '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/',
+ ],
+ 'message': 'Merging SWE Libraries'
+ },
+ ],
+ }
+ ]
+}
\ No newline at end of file
diff --git a/tools/generate_about.sh b/tools/generate_about.sh
index 3e15e2f..9e04e95 100755
--- a/tools/generate_about.sh
+++ b/tools/generate_about.sh
@@ -120,7 +120,8 @@
# trim branch to a num, or a smaller name
BRANCH=${BRANCH##*/}
fi
-
+ #SWE-FIXME
+ BRANCH=2125
# tack on branch
VERSION=${VERSION}.${BRANCH}
@@ -131,6 +132,8 @@
if [[ -n ${MERGE_BASE} ]]
then
BUILDID=$(git log --oneline ${MERGE_BASE}.. | wc -l)
+ #SWE-FIXME
+ BUILDID=1200
VERSION=${VERSION}.${BUILDID}
else
warning "using version ${VERSION}.. merge-base:\"${MERGE_BASE}\" branch: \"${BRANCH}\""
