commit ba66a0ef09a6bbeb6e7e2cfbef82f15b9b625bc8
author Bartosz Fabianowski <bartfab@google.com> Fri Mar 10 15:47:14 2017 +0100
committer Bartosz Fabianowski <bartfab@google.com> Mon Mar 13 23:59:35 2017 +0100
tree 87351545eaf1aabc7aa595a07cf33188396b85a8
parent 26a5a71d3100dc90e7715d0dc8a39ccaf2ba3dd0

Update strings and layout for enterprise privacy

This CL continues the finalization of UI layout and strings for the
enterprise privacy page:
* Turn footer into a header
* Update strings
* Dynamically generate summaries for entry points in security page

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: Ibf248ac269380fb1b919b01f88f721130060b7f9

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 23dc206..2229d01 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1506,7 +1506,7 @@
         </activity>
 
         <activity android:name="Settings$EnterprisePrivacySettingsActivity"
-                android:label="@string/enterprise_privacy_settings_title"
+                android:label="@string/enterprise_privacy_settings"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$SecuritySettingsActivity">
             <intent-filter>