Rename ContactSocialWidget to SocialWidget. Remove camelHumps from package
Change-Id: I73ad45dae896bb82b50b880b411741740185374d
diff --git a/res/layout/contact_social_widget_configure_activity.xml b/res/layout/contact_social_widget_configure_activity.xml
deleted file mode 100644
index 7f6f117..0000000
--- a/res/layout/contact_social_widget_configure_activity.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
->
- <fragment
- class="com.android.contacts.list.DefaultContactBrowseListFragment"
- android:id="@android:id/list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:fastScrollEnabled="true"
- />
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/contact_social_widget.xml b/res/layout/social_widget.xml
similarity index 100%
rename from res/layout/contact_social_widget.xml
rename to res/layout/social_widget.xml
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 8c43e9a..4a397f6 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -53,7 +53,7 @@
<item name="list_item_photo_size">64dip</item>
</style>
- <style name="ContactSocialWidgetConfigureTheme" parent="ContactPickerTheme">
+ <style name="SocialWidgetConfigureTheme" parent="ContactPickerTheme">
</style>
<style name="ContactsSearchTheme" parent="ContactPickerTheme">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 10da2ee..5f64e27 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -173,7 +173,7 @@
<item name="list_item_header_checkbox_margin">5dip</item>
</style>
- <style name="ContactSocialWidgetConfigureTheme" parent="ContactPickerTheme">
+ <style name="SocialWidgetConfigureTheme" parent="ContactPickerTheme">
</style>
<style name="JoinContactActivityTheme" parent="ContactPickerTheme">
diff --git a/res/xml/contact_social_widget_info.xml b/res/xml/social_widget_info.xml
similarity index 84%
rename from res/xml/contact_social_widget_info.xml
rename to res/xml/social_widget_info.xml
index 4b83e2d..330ddc7 100644
--- a/res/xml/contact_social_widget_info.xml
+++ b/res/xml/social_widget_info.xml
@@ -18,6 +18,6 @@
android:minWidth="294dip"
android:minHeight="72dip"
android:updatePeriodMillis="3600000"
- android:initialLayout="@layout/contact_social_widget"
- android:configure="com.android.contacts.contactSocialWidget.ContactSocialWidgetConfigureActivity" >
+ android:initialLayout="@layout/social_widget"
+ android:configure="com.android.contacts.socialwidget.SocialWidgetConfigureActivity" >
</appwidget-provider>