| commit | d607f4eed7135ce715bf2baf38bbb6d848041888 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Thu Feb 19 19:48:50 2015 -0800 |
| committer | The Android Automerger <android-build@google.com> | Thu Feb 19 19:48:50 2015 -0800 |
| tree | bb8fa8fc5f33435e2c0a050f1f2164787105f0b2 | |
| parent | d0f748a7d095fc23bde005b68277dd931349e2f8 [diff] | |
| parent | fb5ac2e3f013b94d36d2cc3d63a47a248c606eb3 [diff] |
merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 6b7ac8c..b4d8c63 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -942,6 +942,7 @@ ByteArrayOutputStream bos = new ByteArrayOutputStream(); OutputStreamWriter out = new OutputStreamWriter(bos); fromFile.write(out); + out.flush(); return bos.toByteArray(); } else { return EMPTY_DATA;
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index f6d4be5..5c41436 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -97,7 +97,8 @@ android:layout_width="@dimen/notification_panel_width" android:layout_height="match_parent" android:layout_gravity="@integer/notification_panel_layout_gravity" - android:layout_marginBottom="@dimen/close_handle_underlap" /> + android:layout_marginBottom="@dimen/close_handle_underlap" + android:importantForAccessibility="no" /> <ViewStub android:id="@+id/keyguard_user_switcher"