Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee168a43 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Use new status bar disable flags." into ics-mr0

parents dccda985 4d2bfd14

src/com/android/settings/CryptKeeper.java

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
                | StatusBarManager.DISABLE_NOTIFICATION_ICONS

                | StatusBarManager.DISABLE_NOTIFICATION_ALERTS

                | StatusBarManager.DISABLE_SYSTEM_INFO

                | StatusBarManager.DISABLE_NAVIGATION

                | StatusBarManager.DISABLE_HOME

                | StatusBarManager.DISABLE_RECENT

                | StatusBarManager.DISABLE_BACK);



        // Check for (and recover) retained instance data

src/com/android/settings/CryptKeeperConfirm.java

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ public class CryptKeeperConfirm extends Fragment { 
                    | StatusBarManager.DISABLE_NOTIFICATION_ICONS

                    | StatusBarManager.DISABLE_NOTIFICATION_ALERTS

                    | StatusBarManager.DISABLE_SYSTEM_INFO

                    | StatusBarManager.DISABLE_NAVIGATION

                    | StatusBarManager.DISABLE_HOME

                    | StatusBarManager.DISABLE_RECENT

                    | StatusBarManager.DISABLE_BACK);



            // Post a delayed message in 700 milliseconds to enable encryption.