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

Commit 87f2b090 authored by Winson Chung's avatar Winson Chung
Browse files

Merging from ub-launcher3-master @ build 6925377

Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_master_6925377.html

Change-Id: I928b100c8f41abff34047df69d988622123f9939
parents f9935188 4c3952dc
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -36,14 +36,12 @@ java_library_static {
    name: "launcher_log_protos_lite",
    srcs: [
        "protos/*.proto",
        "proto_overrides/*.proto",
    ],
    sdk_version: "current",
    proto: {
        type: "lite",
        local_include_dirs:[
            "protos",
            "proto_overrides",
        ],
    },
    static_libs: ["libprotobuf-java-lite"],
+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@
    with some minor changed based on the derivative app.
    -->

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.CALL_PHONE" />
    <uses-permission android:name="android.permission.SET_WALLPAPER" />
    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+42 −38
Original line number Diff line number Diff line
160759508
144170434
144170434
161801331
162564471
160361464
161901771
160568387
162623012
162012217
160718310
160361464
160718310
162012217
160748731
154951045
162861289
149934536
149934536
144170434
144170434
162454040
161273376
149934536
149934536
158701272
162871508
149934536
161939759
154964045
161536946
149934536
161685099
162812884
162480567
162480567
149934536
149934536
171450807
170675311
170338029
170338170
160544577
171171594
170488559
171131394
171131394
171026321
170648272
170752716
170611866
170702596
170487752
170665892
168608912
170636685
169771796
141126144
166614700
168805872
170263425
169221288
143965596
169221287
167259591
156044202
169438169
164926736
168653219
169963211
170121063
169988381
169980192
169221288
169385783
168167693
169796517
169330678
168818961
168608912
+39 −24
Original line number Diff line number Diff line
144170434
149934536
154951045
154964045
158701272
160361464
160568387
160718310
160748731
160759508
161273376
161536946
161685099
161801331
161901771
161939759
162012217
162454040
162480567
162564471
162623012
162812884
162861289
162871508
141126144
143965596
156044202
160544577
164926736
166614700
167259591
168167693
168608912
168653219
168805872
168818961
169221287
169221288
169330678
169385783
169438169
169771796
169796517
169963211
169980192
169988381
170121063
170263425
170338029
170338170
170487752
170488559
170611866
170636685
170648272
170665892
170675311
170702596
170752716
171026321
171131394
171171594
171450807
Loading