merge heads

This commit is contained in:
Jimmy Shih
2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
-11
View File
@@ -33,16 +33,5 @@ limitations under the License.
android:defaultValue="false"
android:key="@string/stats_show_coordinate_key"
android:title="@string/settings_stats_coordinate" />
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/stats_show_calorie_key"
android:title="@string/stats_calorie" />
<EditTextPreference
android:dependency="@string/stats_show_calorie_key"
android:imeOptions="actionDone"
android:inputType="number"
android:key="@string/stats_weight_key"
android:persistent="false"
android:title="@string/settings_stats_calorie_weight" />
</PreferenceCategory>
</PreferenceScreen>