diff options
| author | Jason Long <jasonlong@google.com> | 2014-06-09 20:02:15 -0700 |
|---|---|---|
| committer | Jason Long <jasonlong@google.com> | 2014-07-22 14:51:44 -0700 |
| commit | 193f049221dce7764d50293ac02255fd0223c538 (patch) | |
| tree | db818aa12ab22b1fb8ff3f38a74884e881509c93 | |
| parent | 9c2be6c7ba3d7dce58e8f4ec1617698c54ae808e (diff) | |
| download | frameworks_base-193f049221dce7764d50293ac02255fd0223c538.zip frameworks_base-193f049221dce7764d50293ac02255fd0223c538.tar.gz frameworks_base-193f049221dce7764d50293ac02255fd0223c538.tar.bz2 | |
Switched Holo to Material for account chooser activities.
Change-Id: I6a44fb174eb4e981c37fca0836b103d7ee3f5ffe
| -rw-r--r-- | core/res/AndroidManifest.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index d4a3b12..30629ad 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -894,7 +894,7 @@ android:label="@string/permlab_nfc" /> <!-- @SystemApi Allows an internal user to use privileged ConnectivityManager APIs. - @hide --> + @hide --> <permission android:name="android.permission.CONNECTIVITY_INTERNAL" android:permissionGroup="android.permission-group.NETWORK" android:protectionLevel="signature|system" /> @@ -905,10 +905,10 @@ android:protectionLevel="signature|system" /> <!-- @SystemApi Allows access to the loop radio (Android@Home mesh network) device. - @hide --> + @hide --> <permission android:name="android.permission.LOOP_RADIO" - android:permissionGroup="android.permission-group.NETWORK" - android:protectionLevel="signature|system" /> + android:permissionGroup="android.permission-group.NETWORK" + android:protectionLevel="signature|system" /> <!-- Allows sending and receiving handover transfer status from Wifi and Bluetooth @hide @@ -2856,7 +2856,7 @@ <activity android:name="android.accounts.ChooseAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@android:style/Theme.Holo.Dialog" + android:theme="@android:style/Theme.Material.Dialog" android:label="@string/choose_account_label" android:process=":ui"> </activity> @@ -2864,14 +2864,14 @@ <activity android:name="android.accounts.ChooseTypeAndAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@android:style/Theme.Holo.Dialog" + android:theme="@android:style/Theme.Material.Dialog" android:label="@string/choose_account_label" android:process=":ui"> </activity> <activity android:name="android.accounts.ChooseAccountTypeActivity" android:excludeFromRecents="true" - android:theme="@android:style/Theme.Holo.Dialog" + android:theme="@android:style/Theme.Material.Dialog" android:label="@string/choose_account_label" android:process=":ui"> </activity> @@ -2879,14 +2879,14 @@ <activity android:name="android.accounts.CantAddAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@android:style/Theme.Holo.Dialog.NoActionBar" + android:theme="@android:style/Theme.Material.Dialog.NoActionBar" android:process=":ui"> </activity> <activity android:name="android.accounts.GrantCredentialsPermissionActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@android:style/Theme.Holo.DialogWhenLarge" + android:theme="@android:style/Theme.Material.DialogWhenLarge" android:process=":ui"> </activity> |