PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of d30af7c to master

Browse Source 
Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1
This commit is contained in:
Andreas Gampe
2016-08-30 20:22:02 -07:00
parent f0213599e4 d30af7c247
commit ada98fb5b3
5 changed files with 289 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/advanced_apps.xml
View File

@@ -30,10 +30,7 @@
<PreferenceScreen
android:key="domain_urls"
android:title="@string/domain_urls_title"
android:fragment="com.android.settings.applications.ManageApplications">
<extra
android:name="classname"
android:value="com.android.settings.Settings$DomainsURLsAppListActivity" />
android:fragment="com.android.settings.applications.ManageDomainUrls">
</PreferenceScreen>
<Preference