am ff70539b: am 6dc46bc4: Merge "APN updates for Europe" into lmp-dev
* commit 'ff70539b4dc97f71e845f0171834568c8ef645cd':
diff --git a/apps/SetupCustomizer/Android.mk b/apps/SetupCustomizer/Android.mk
new file mode 100644
index 0000000..9312a36
--- /dev/null
+++ b/apps/SetupCustomizer/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/priv-app
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := TvSetupCustomizer
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/apps/SetupCustomizer/AndroidManifest.xml b/apps/SetupCustomizer/AndroidManifest.xml
new file mode 100644
index 0000000..bdd31ff
--- /dev/null
+++ b/apps/SetupCustomizer/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.google.android.tvsetup.partnercustomizer">
+
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.INTERNET" />
+
+ <application android:label="@string/app_label">
+
+ <receiver android:name=".PartnerReceiver">
+ <intent-filter>
+ <action android:name="com.google.android.tvsetup.action.PARTNER_CUSTOMIZATION" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+
+ <intent-filter>
+ <action android:name="android.intent.action.PACKAGE_ADDED" />
+ <action android:name="android.intent.action.PACKAGE_REMOVED" />
+ <data android:scheme="package"/>
+ </intent-filter>
+ </receiver>
+ </application>
+</manifest>
diff --git a/apps/SetupCustomizer/proguard-project.txt b/apps/SetupCustomizer/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/apps/SetupCustomizer/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/apps/SetupCustomizer/res/drawable-xhdpi/welcome_background.png b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_background.png
new file mode 100644
index 0000000..e8cd090
--- /dev/null
+++ b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_background.png
Binary files differ
diff --git a/apps/SetupCustomizer/res/drawable-xhdpi/welcome_image.png b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_image.png
new file mode 100644
index 0000000..b6c099f
--- /dev/null
+++ b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_image.png
Binary files differ
diff --git a/apps/SetupCustomizer/res/drawable-xhdpi/welcome_logo_bottomleft.png b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_logo_bottomleft.png
new file mode 100644
index 0000000..af6cfc2
--- /dev/null
+++ b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_logo_bottomleft.png
Binary files differ
diff --git a/apps/SetupCustomizer/res/drawable-xhdpi/welcome_logo_topleft.png b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_logo_topleft.png
new file mode 100644
index 0000000..96b1638
--- /dev/null
+++ b/apps/SetupCustomizer/res/drawable-xhdpi/welcome_logo_topleft.png
Binary files differ
diff --git a/apps/SetupCustomizer/res/values/bools.xml b/apps/SetupCustomizer/res/values/bools.xml
new file mode 100644
index 0000000..234f35f
--- /dev/null
+++ b/apps/SetupCustomizer/res/values/bools.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2012-2014 Google Inc. All Rights Reserved. -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Display "SKIP" in network selection screen -->
+ <bool name="show_skip_network">true</bool>
+
+</resources>
diff --git a/apps/SetupCustomizer/res/values/colors.xml b/apps/SetupCustomizer/res/values/colors.xml
new file mode 100644
index 0000000..810e40e
--- /dev/null
+++ b/apps/SetupCustomizer/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="partner_color">#FFFF00FF</color>
+</resources>
diff --git a/apps/SetupCustomizer/res/values/dimens.xml b/apps/SetupCustomizer/res/values/dimens.xml
new file mode 100644
index 0000000..fc7a365
--- /dev/null
+++ b/apps/SetupCustomizer/res/values/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2012-2014 Google Inc. All Rights Reserved. -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <!-- Welcome text font size -->
+ <!-- dimen name="welcome_font_size">12dp</dimen -->
+
+</resources>
diff --git a/apps/SetupCustomizer/res/values/strings.xml b/apps/SetupCustomizer/res/values/strings.xml
new file mode 100644
index 0000000..7572d9f
--- /dev/null
+++ b/apps/SetupCustomizer/res/values/strings.xml
@@ -0,0 +1,8 @@
+<resources>
+
+ <string name="app_label">SetupCustomizer</string>
+
+ <!-- Welcome messgae -->
+ <string name="welcome_message">welcome_message</string>
+
+</resources>
diff --git a/apps/SetupCustomizer/src/com/android/tvsetup/partnercustomizer/PartnerReceiver.java b/apps/SetupCustomizer/src/com/android/tvsetup/partnercustomizer/PartnerReceiver.java
new file mode 100644
index 0000000..cf8efd9
--- /dev/null
+++ b/apps/SetupCustomizer/src/com/android/tvsetup/partnercustomizer/PartnerReceiver.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.tvsetup.partnercustomizer;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * This class allows the system/setup app to find the partner customization package.
+ *
+ * Package must be a system app to be used for partner customization.
+ */
+public class PartnerReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ }
+}
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 6985fb9..70abbe5 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -4449,38 +4449,15 @@
type="mms"
/>
- <apn carrier="Tele2 Internet"
+ <apn carrier="Tele2"
mcc="240"
mnc="07"
- apn="4g.tele2.se"
- type="default,supl"
- />
-
- <apn carrier="Tele2 MMS"
- mcc="240"
- mnc="07"
- apn="4g.tele2.se"
- mmsc="http://mmsc.tele2.se"
- mmsproxy="130.244.202.30"
+ apn="internet.tele2.no"
+ mmsc="http://mmsc.tele2.no"
+ mmsproxy="193.12.40.14"
mmsport="8080"
- type="mms"
- />
-
- <apn carrier="Tele2 Internet 3G"
- mcc="240"
- mnc="07"
- apn="internet.tele2.se"
- type="default,supl"
- />
-
- <apn carrier="Tele2 MMS 3G"
- mcc="240"
- mnc="07"
- apn="internet.tele2.se"
- mmsc="http://mmsc.tele2.se"
- mmsproxy="130.244.202.30"
- mmsport="8080"
- type="mms"
+ protocol="IP"
+ type="default,supl,mms"
/>
<apn carrier="Tele2 Internet"
@@ -6756,7 +6733,7 @@
mcc="302"
mnc="220"
apn="sp.koodo.com"
- type="default,mms,supl"
+ type="default,mms,supl,dun"
mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
mmsproxy="74.49.0.18"
mmsport="80"
@@ -6764,7 +6741,7 @@
mvno_type="gid"
/>
- <apn carrier="PC mobile"
+ <apn carrier="Mobile Internet"
mcc="302"
mnc="220"
apn="sp.mb.com"
@@ -6937,18 +6914,6 @@
mvno_match_data="2C"
/>
- <apn carrier="Fido LTE"
- mcc="302"
- mnc="370"
- apn="ltemobile.apn"
- type="default,mms,supl"
- mmsc="http://mms.fido.ca"
- mmsproxy="mmsproxy.fido.ca"
- mmsport="80"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
-
<apn carrier="Internet"
mcc="302"
mnc="490"
@@ -7024,18 +6989,6 @@
mvno_match_data="2C"
/>
- <apn carrier="Rogers LTE"
- mcc="302"
- mnc="720"
- apn="ltemobile.apn"
- type="default,mms,supl"
- mmsc="http://mms.gprs.rogers.com"
- mmsproxy="mmsproxy.rogers.com"
- mmsport="80"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- />
-
<apn carrier="chatr"
mcc="302"
mnc="720"
@@ -25925,15 +25878,7 @@
mcc="419"
mnc="03"
apn="action.wataniya.com"
- type="default,supl"
- />
-
- <apn carrier="WAPAction"
- mcc="419"
- mnc="03"
- apn="wap.wataniya.com"
- proxy="194.126.53.64"
- port="8080"
+ authtype="0"
type="default,supl"
/>
@@ -25944,6 +25889,7 @@
mmsc="http://action.wataniya.com"
mmsproxy="194.126.53.64"
mmsport="8080"
+ authtype="0"
type="mms"
/>
@@ -26967,12 +26913,12 @@
mcc="440"
mnc="20"
apn="plus.acs.jp"
- user="plusw6q9tattkmpk"
- password="msfbbam83bsdetxb"
- mmsproxy="andmms.plusacs.ne.jp"
+ user="ym"
+ password="ym"
+ mmsproxy="andmms.plus.acs.ne.jp"
mmsport="8080"
mmsc="http://mms-s"
- type="default,mms,supl"
+ type="default,mms,supl,hipri"
authtype="2"
/>
@@ -32749,17 +32695,6 @@
password='1212'
/>
- <apn carrier='Nextel GPS'
- mcc='724'
- mnc='39'
- apn='gps.nextel3g.net.br'
- server='http://supl.nextel3g.net.br'
- authtype='0'
- type='supl'
- protocol='IPV4V6'
- roaming_protocol='IPV4V6'
- />
-
<apn carrier='Nextel MMS'
mcc='724'
mnc='39'
@@ -32773,22 +32708,12 @@
roaming_protocol='IPV4V6'
/>
- <apn carrier='Nextel Modem'
- mcc='724'
- mnc='39'
- apn='modem.nextel3g.net.br'
- authtype='0'
- type='dun'
- protocol='IPV4V6'
- roaming_protocol='IPV4V6'
- />
-
<apn carrier='Nextel WAP'
mcc='724'
mnc='39'
apn='wap.nextel3g.net.br'
authtype='0'
- type='default'
+ type='default,dun'
protocol='IPV4V6'
roaming_protocol='IPV4V6'
/>
