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

Commit ec3aad2e authored by Qiwen Zhao's avatar Qiwen Zhao
Browse files

Merge commit 'd5c6745b' into klp-dev-plus-aosp

Conflicts:
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-fa/strings.xml
	res/values-iw/strings.xml
parents 51ac5ce5 d6c6745b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@
<manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.launcher3">
    <uses-sdk android:targetSdkVersion="19" android:minSdkVersion="16"/>

    <permission
        android:name="com.android.launcher3.permission.PRELOAD_WORKSPACE"
+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@
  public void onClickAllAppsButton(android.view.View);
  public void onClickAppMarketButton(android.view.View);
  public void dismissFirstRunCling(android.view.View);
  public void dismissMigrationClingCopyApps(android.view.View);
  public void dismissMigrationClingUseDefault(android.view.View);
  public void dismissMigrationWorkspaceCling(android.view.View);
  public void dismissWorkspaceCling(android.view.View);
  public void dismissAllAppsCling(android.view.View);
}
+21.9 KiB
Loading image diff...
+15 KiB
Loading image diff...
+33.5 KiB
Loading image diff...
Loading