Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/base/resources/xml/preferences_home.xml

Issue 29344664: Issue 2622 - Setting/Customize: Duplicate function between Download updates automatically and Home/… (Closed)
Patch Set: Created May 27, 2016, 10:46 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- This Source Code Form is subject to the terms of the Mozilla Public 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public
3 - License, v. 2.0. If a copy of the MPL was not distributed with this 3 - License, v. 2.0. If a copy of the MPL was not distributed with this
4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
5 5
6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" 6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
7 android:title="@string/pref_category_home" 7 android:title="@string/pref_category_home"
8 android:enabled="false"> 8 android:enabled="false">
9 9
10 <PreferenceCategory android:title="@string/pref_category_home_homepage" 10 <PreferenceCategory android:title="@string/pref_category_home_homepage"
11 android:key="android.not_a_preference.category_homepage" > 11 android:key="android.not_a_preference.category_homepage" >
12 12
13 <org.mozilla.gecko.preferences.SetHomepagePreference 13 <org.mozilla.gecko.preferences.SetHomepagePreference
14 android:key="android.not_a_preference.homepage" 14 android:key="android.not_a_preference.homepage"
15 android:title="@string/home_homepage_title" /> 15 android:title="@string/home_homepage_title" />
16 16
17 </PreferenceCategory> 17 </PreferenceCategory>
18 18
19 <org.mozilla.gecko.preferences.PanelsPreferenceCategory 19 <org.mozilla.gecko.preferences.PanelsPreferenceCategory
20 android:title="@string/pref_category_home_panels"/> 20 android:title="@string/pref_category_home_panels"/>
21 21
22 <PreferenceCategory android:title="@string/pref_category_home_content_settin gs"> 22 <PreferenceCategory android:title="@string/pref_category_home_content_settin gs">
23 23
24 <CheckBoxPreference android:key="android.not_a_preference.home_suggested _sites" 24 <CheckBoxPreference android:key="android.not_a_preference.home_suggested _sites"
25 android:title="@string/pref_home_suggested_sites" 25 android:title="@string/pref_home_suggested_sites"
26 android:summary="@string/pref_home_suggested_sites_s ummary" 26 android:summary="@string/pref_home_suggested_sites_s ummary"
27 android:defaultValue="true" /> 27 android:defaultValue="true" />
28 28
29 <!--
30 Removing duplicate setting
31 See https://issues.adblockplus.org/ticket/2622
32
29 <ListPreference android:key="home.sync.updateMode" 33 <ListPreference android:key="home.sync.updateMode"
30 android:title="@string/pref_home_updates" 34 android:title="@string/pref_home_updates"
31 android:entries="@array/pref_home_updates_entries" 35 android:entries="@array/pref_home_updates_entries"
32 android:entryValues="@array/pref_home_updates_values" 36 android:entryValues="@array/pref_home_updates_values"
33 android:persistent="false" /> 37 android:persistent="false" />
38 -->
34 39
35 </PreferenceCategory> 40 </PreferenceCategory>
36 41
37 </PreferenceScreen> 42 </PreferenceScreen>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld