Commit Graph

14827 Commits

Author SHA1 Message Date
Bill Yi d2fca6b2cd Import translations. DO NOT MERGE am: d730a04ef7 -s ours am: db360b65d4 -s ours am: 957c65fe13 -s ours
am: b7bc3a8582  -s ours

Change-Id: Idba06804823ab726c160097951cde0406972007e
2016-11-24 02:06:41 +00:00
Tony Wickham ea7fc96298 Fix the build am: 4707e2b64d am: f304453c99 am: d85854558a
am: c787609e6d

Change-Id: Ib89c31375856e1d7c3e6b151a78c7be6f6e3a445
2016-11-24 02:06:31 +00:00
Tony Wickham 2de38dfff4 Fix the build am: 4707e2b64d am: 7815035df0 am: 5ecb655ac4
am: 8de70681f8

Change-Id: Ie0095ff853d560e80f2ae9699606ca865574c23d
2016-11-24 02:06:20 +00:00
Hyunyoung Song d11580e82d Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 027594fc1b am: 9015be72e4
am: a088d2be66

Change-Id: Idc55667e44750ec6b44f21d95dd9056b3f224c81
2016-11-24 02:06:10 +00:00
Hyunyoung Song 2088be1fef Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 8868238fb2 am: 7cd14d0e55
am: db0d2d6122

Change-Id: I0fc7059b4cadbf04e3aedd45788a2c4bd42d3195
2016-11-24 02:05:59 +00:00
Christopher Tate df6244f83b Track adjustments to new wallpaper APIs am: ea4cc66cf3 am: 9f9d83d750 am: 449cbc3ab2
am: d30527cb9e

Change-Id: Icff840366d4961cef42bc47cd297c2c59f118b02
2016-11-24 02:05:48 +00:00
Christopher Tate c46849bed7 Track adjustments to new wallpaper APIs am: ea4cc66cf3 am: efe81e1226 am: 0cbd872189
am: 9cb2bdb8fa

Change-Id: I92b093df6ed6765387942990cdb1b07dd746f06e
2016-11-24 02:05:38 +00:00
Hyunyoung Song b9ef562e93 Merge "Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7" into nyc-mr1-dev-plus-aosp am: 3a40216fa0
am: e878f1c719

Change-Id: I4690e7c5917fc321ee0f0982f2041850dd2a8937
2016-11-24 02:05:27 +00:00
Hyunyoung Song 331cc230af Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7 am: 896dd9a122
am: 57622d0578

Change-Id: I923238f0f846368db002cfb1614473ab7b0956c1
2016-11-24 02:05:18 +00:00
Hyunyoung Song df304a67ec Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 908298f567 am: 2aca1b1820
am: 8fd416a7be

Change-Id: Ibf9bb3985ef61714040f6d1bc90ac0094aa432a4
2016-11-24 02:03:11 +00:00
Hyunyoung Song 74d09c3dea resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp am: 3e906a925c am: 724e51e88d
am: 044e71c2d0

Change-Id: I7b4ed8280010e11cc4d3153bde326e917f1a30cb
2016-11-24 02:02:58 +00:00
Bill Yi b7bc3a8582 Import translations. DO NOT MERGE am: d730a04ef7 -s ours am: db360b65d4 -s ours
am: 957c65fe13  -s ours

Change-Id: I01680e8da0f8b18b5de1f4acf0c9d421b5acf936
2016-11-24 02:02:57 +00:00
Hyunyoung Song aff2b79dff resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp am: 1b1b84e96a -s ours
am: 57d4540382

Change-Id: Ic1099c4cff7f7bd93bd9c33e4d9ea987db58713e
2016-11-24 02:02:48 +00:00
Tony Wickham c787609e6d Fix the build am: 4707e2b64d am: f304453c99
am: d85854558a

Change-Id: I31fbf6b750e9239b3f07aa6877c3b66d2b714016
2016-11-24 02:02:46 +00:00
Tony Wickham 8de70681f8 Fix the build am: 4707e2b64d am: 7815035df0
am: 5ecb655ac4

Change-Id: Id81fd03e0435f1c039b95fcca2adf86558846399
2016-11-24 02:02:35 +00:00
Hyunyoung Song a088d2be66 Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 027594fc1b
am: 9015be72e4

Change-Id: I2e1b96f4d3cde3b5657ba39304a1144889dc4114
2016-11-24 02:02:22 +00:00
Hyunyoung Song db0d2d6122 Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 8868238fb2
am: 7cd14d0e55

Change-Id: I3d9598547e91d3999bd3c6f8d269f52b06b4ebe0
2016-11-24 02:02:09 +00:00
Christopher Tate d30527cb9e Track adjustments to new wallpaper APIs am: ea4cc66cf3 am: 9f9d83d750
am: 449cbc3ab2

Change-Id: I1ec86a58f0fd66f26315a34da9199bb317272290
2016-11-24 02:01:58 +00:00
Christopher Tate 9cb2bdb8fa Track adjustments to new wallpaper APIs am: ea4cc66cf3 am: efe81e1226
am: 0cbd872189

Change-Id: I8adecbe9cf82de319769396ab29cd061d215e825
2016-11-24 02:01:47 +00:00
Hyunyoung Song e878f1c719 Merge "Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7" into nyc-mr1-dev-plus-aosp
am: 3a40216fa0

Change-Id: I9771f7311fd49a535e91fc559024c9e17cff8cbb
2016-11-24 02:01:28 +00:00
Hyunyoung Song 57622d0578 Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7
am: 896dd9a122

Change-Id: I3ccf8918a212d3248bd5c77cbdfbc0e8ebcb1536
2016-11-24 02:01:26 +00:00
Hyunyoung Song 8fd416a7be Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 908298f567
am: 2aca1b1820

Change-Id: I3a07802a21b3af9c3dea9afac78083011eda1d47
2016-11-24 02:01:15 +00:00
Hyunyoung Song 044e71c2d0 resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp am: 3e906a925c
am: 724e51e88d

Change-Id: I2ed77afea9f22d4f34007dbb11908cd22d814dc1
2016-11-24 02:01:01 +00:00
Hyunyoung Song 57d4540382 resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp
am: 1b1b84e96a  -s ours

Change-Id: I80b512c0e92d5be5a62ae55f62f300c0cadb41fd
2016-11-24 02:00:49 +00:00
Ed Tam e30d79650b Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp am: 529970a1d6
am: 55fac8f48d

Change-Id: Iaab1f1a421c014f27c81951d0bc37ca9857615e5
2016-11-24 01:56:49 +00:00
Ed Tam 8d8c77bc21 Fix RecyclerView resource path am: 43d0156 am: a6fb1e6 am: 06e2c9a3be
am: 409f22f726

Change-Id: I01f4231f7fc49c06e0c30482c1ca58eaf5d5db67
2016-11-24 01:56:39 +00:00
Ed Tam 4beb206647 Fix RecyclerView resource path am: 43d0156 am: 3655a7d am: e97fdeed19
am: 89bdef0ae2

Change-Id: Ib31f15a28de0dc64f60023743b0663d658aff835
2016-11-24 01:56:28 +00:00
Dan Willemsen 594cf7c4f9 Merge "Replace custom rules with BUILD_PREBUILT" am: 5892520 am: f9afd3b6cb -s ours
am: 2ba318792f

Change-Id: Ia26bc77da7181bf0a9b3a7706a5a3cf1f174458d
2016-11-24 01:56:18 +00:00
Ed Tam 55fac8f48d Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp
am: 529970a1d6

Change-Id: I6d8637fa42267ff46aef801e1749fc375b9bf324
2016-11-24 01:54:43 +00:00
Ed Tam 409f22f726 Fix RecyclerView resource path am: 43d0156 am: a6fb1e6
am: 06e2c9a3be

Change-Id: I374b5445f21ea0d73671e01119a90eb3077141f9
2016-11-24 01:54:41 +00:00
Ed Tam 89bdef0ae2 Fix RecyclerView resource path am: 43d0156 am: 3655a7d
am: e97fdeed19

Change-Id: I6bb3d021c987036464e6c204ac243d25c169522c
2016-11-24 01:54:29 +00:00
Dan Willemsen 2ba318792f Merge "Replace custom rules with BUILD_PREBUILT" am: 5892520
am: f9afd3b6cb  -s ours

Change-Id: I20226ef2c2bc51fb1334547db1ba813a84ac8c63
2016-11-24 01:54:17 +00:00
Dmitry Kalita 8267b10955 Merge "Fix restoring of layer type" am: 0b28b42 am: 8ce0be3353 -s ours
am: 64ac4368c6

Change-Id: I3f38aef2a8976a7c0578b61b625f7ca3cba4d022
2016-11-24 01:47:17 +00:00
Dmitry Kalita 64ac4368c6 Merge "Fix restoring of layer type" am: 0b28b42
am: 8ce0be3353  -s ours

Change-Id: I447f0ee5bcf0c7b3db98a1b54cb4cfb061a7541f
2016-11-24 01:45:17 +00:00
Shirley Yuen f73d67225e Keep history after reset to ub-launcher3-calgary-polish am: 16168daf88 am: 2e1bbbbbea
am: 0549e116e0

Change-Id: Idc8d0176051077a2ce3ca9262bfb5244b7de6dc5
2016-10-26 18:41:19 +00:00
Shirley Yuen 7630c4249b Keep history after reset to ub-launcher3-calgary-polish am: f268e0bd41
am: 6095d9ff91

Change-Id: I7273299f33e50ba89074ff3bae7761d880488ebb
2016-10-26 18:41:07 +00:00
Shirley Yuen 37b5a7f3f1 Keep history after reset to ub-launcher3-calgary-polish
am: f213057c8b

Change-Id: I27e870b3d61c68b73ea00ed5265afdeed31b44dc
2016-10-26 18:40:43 +00:00
Shirley Yuen 0549e116e0 Keep history after reset to ub-launcher3-calgary-polish am: 16168daf88
am: 2e1bbbbbea

Change-Id: Ib4a31941b7c2f9d840153b2339f5db46670da39d
2016-10-26 18:37:24 +00:00
Shirley Yuen 6095d9ff91 Keep history after reset to ub-launcher3-calgary-polish
am: f268e0bd41

Change-Id: Ia6e5ed24b1bd45c8e03728a4fe8d3ee4025d79e0
2016-10-26 18:37:12 +00:00
Shirley Yuen 2e1bbbbbea Keep history after reset to ub-launcher3-calgary-polish
am: 16168daf88

Change-Id: I635ecad8bcd7699f03c1a4c8d3b4a00dbaeedae4
2016-10-26 18:32:41 +00:00
Shirley Yuen f213057c8b Keep history after reset to ub-launcher3-calgary-polish 2016-10-25 12:15:26 -07:00
Shirley Yuen f268e0bd41 Keep history after reset to ub-launcher3-calgary-polish 2016-10-25 12:15:21 -07:00
Shirley Yuen 16168daf88 Keep history after reset to ub-launcher3-calgary-polish 2016-10-25 10:19:42 -07:00
Sunny Goyal 28a64381b6 Fixing text search where a word starting with lower case was
not being matched

Bug: 32249413
Change-Id: I0f5e24052759a734fe0df3bd3d0bf2e7ef7f2713
2016-10-19 07:54:22 +01:00
Sunny Goyal a833b6d720 Missing call in write to parcel
Bug: 17924700
Change-Id: Ie48757fc53674979b8e92f96b5281f965e2ef3b4
2016-10-18 08:51:22 +01:00
Sunny Goyal f4b457709f Removing the logic around closeSystemDialog on ACTION_CLOSE_SYSTEM_DIALOGS
Launcher does not use any panels which need closing & system sends an
onActivityResult(RESULT_CANCELLED), we do  not need special handling for
waitingForResult

Bug: 32127718
Change-Id: Iff5161444bc909442f6acbe52cb3fb5a2d9ae4da
2016-10-18 00:17:54 +01:00
Bill Yi 3cca5a0cae Import translations. DO NOT MERGE
Change-Id: I93bb668512491ac8c026e8a75b8a50b0252965d4
Auto-generated-cl: translation import
2016-10-13 16:56:31 -07:00
Tony Wickham 1d29c6f7d2 Merge "Add feature flag to disable light status bar" into ub-launcher3-calgary-polish 2016-10-13 00:41:57 +00:00
Tony Wickham 0fed55bf03 Add feature flag to disable light status bar
Bug: 32085545
Change-Id: I4860145b00893c20f7e37817e9659ccd90409966
2016-10-12 16:14:36 -07:00
Tony Wickham cf6195268d Merge "Use Launcher.getLauncher(Context) instead of type-casting." into ub-launcher3-calgary-polish 2016-10-12 21:22:05 +00:00