Update flo overlays with tablet settings (not phone)
Bug: 9110575
Change-Id: I3d236bc1b1446127e4ec85b5cb86c0ddec91b98b
Signed-off-by: Ed Tam <etam@google.com>
diff --git a/aosp_flo.mk b/aosp_flo.mk
index 0f2a938..6f1ad0c 100644
--- a/aosp_flo.mk
+++ b/aosp_flo.mk
@@ -19,7 +19,7 @@
# Inherit from the common Open Source product configuration
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
PRODUCT_NAME := aosp_flo
PRODUCT_DEVICE := flo
diff --git a/overlay/packages/apps/Launcher2/res/values/config.xml b/overlay/packages/apps/Launcher2/res/values/config.xml
new file mode 100644
index 0000000..3b82809
--- /dev/null
+++ b/overlay/packages/apps/Launcher2/res/values/config.xml
@@ -0,0 +1,3 @@
+<resources>
+ <bool name="config_largeHeap">true</bool>
+</resources>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
deleted file mode 100644
index 95b6e0e..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=026 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">1048576</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1944</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">2592</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
deleted file mode 100755
index 7f141e3..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=090 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">614400</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1000</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">1296</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
deleted file mode 100644
index 1abe473..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=170 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">1048576</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1944</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">2592</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
deleted file mode 100644
index 5bd2547..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=260 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">1048576</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1944</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">2592</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
deleted file mode 100755
index c0103c5..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- Version History
- version 1 - initial version.
- version 2 - added recipientLimit.
- version 3 - added min/max recycler values.
--->
-<!-- AT&T U.S. mcc=310, mnc=380 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">614400</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1000</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">1296</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
deleted file mode 100755
index 28867a9..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=410 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">614400</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1000</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">1296</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
deleted file mode 100644
index 46c4267..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=490 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">1048576</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1944</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">2592</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
deleted file mode 100755
index cd89021..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=560 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">614400</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1000</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">1296</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
deleted file mode 100755
index 6410e89..0000000
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=680 -->
-
-<mms_config version="3">
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">614400</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">1000</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">1296</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml/mms_config.xml b/overlay/packages/apps/Mms/res/xml/mms_config.xml
deleted file mode 100644
index 21c9c54..0000000
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- Version History
- version 1 - initial version.
- version 2 - added recipientLimit.
- version 3 - added min/max recycler values.
- version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
- <!-- Flag indicating whether MMS should be enabled -->
- <bool name="enabledMMS">true</bool>
-
- <!-- Maximum message size in bytes for a MMS message -->
- <int name="maxMessageSize">307200</int>
-
- <!-- Maximum height for an attached image -->
- <int name="maxImageHeight">480</int>
-
- <!-- Maximum width for an attached image -->
- <int name="maxImageWidth">640</int>
-
- <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
- This is the default value. -->
- <int name="defaultSMSMessagesPerThread">500</int>
-
- <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
- This is the default value. -->
- <int name="defaultMMSMessagesPerThread">50</int>
-
- <!-- Minimum value for the number of messages kept per conversation. The user can never
- set the limit below this value. -->
- <int name="minMessageCountPerThread">10</int>
-
- <!-- Maximum value for the number of messages kept per conversation. The user can never
- set the limit above this value. -->
- <int name="maxMessageCountPerThread">5000</int>
-
- <!-- UAProf URL -->
- <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
-
- <!-- Maximum number of recipients allowed per message. Use a value of -1
- to indicate no limit. -->
- <int name="recipientLimit">-1</int>
-
- <!-- If true, The mms support slide duration.
- If false, The mms does not support slide duration and we have to
- set duration value. -->
- <bool name="enableSlideDuration">true</bool>
-
- <!-- Maximum length for message text. Use a value of -1
- to indicate default value -->
- <int name="maxMessageTextSize">-1</int>
-
- <!-- User-Agent parameter used in MMS http request -->
- <string name="userAgent">Nexus4</string>
-
-</mms_config>
diff --git a/overlay/packages/apps/Nfc/res/values/provisioning.xml b/overlay/packages/apps/Nfc/res/values/provisioning.xml
new file mode 100644
index 0000000..1ca59e3
--- /dev/null
+++ b/overlay/packages/apps/Nfc/res/values/provisioning.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<!-- NFC resources that may need to be customized
+ for different hardware or product builds. -->
+<resources>
+ <!-- Whether the device can receive NFC data in setup wizard -->
+ <bool name="enable_nfc_provisioning">true</bool>
+
+ <!-- The accepted mime-types when NFC is enabled in setup wizard.
+ Mime-types must be lower case, wildcards are *not* accepted. -->
+ <string-array name="provisioning_mime_types">
+ <item>application/vnd.com.google.android.nfcprovision</item>
+ </string-array>
+</resources>
diff --git a/overlay/packages/apps/Phone/res/values/config.xml b/overlay/packages/apps/Phone/res/values/config.xml
deleted file mode 100644
index 355bf1c..0000000
--- a/overlay/packages/apps/Phone/res/values/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Determine whether calls to mute the microphone in PhoneUtils
- are routed through the android.media.AudioManager class (true) or through
- the com.android.internal.telephony.Phone interface (false). -->
- <bool name="send_mic_mute_to_AudioManager">true</bool>
- <!-- Flag indicating if the tty is enabled -->
- <bool name="tty_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
new file mode 100644
index 0000000..2538661
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<resources>
+ <!-- No powercontrol widget for tablets -->
+ <bool name="has_powercontrol_widget">true</bool>
+
+ <!-- Show dock settings when docked -->
+ <bool name="has_dock_settings">true</bool>
+
+</resources>
