54076676a5
Merge "Update the Launcher3 backup.proto to use the deprecated nano package."
2015-10-23 19:28:50 +00:00
52040c2d51
Merge "Set search bar height before setting up views in Launcher." into ub-launcher3-burnaby-polish
2015-10-23 18:38:46 +00:00
01079ac66c
Update the Launcher3 backup.proto to use the deprecated nano package.
...
This fixes the build breakage that will be caused by
I0b930811a3a8240c236d3708d51f11bc04241593
Change-Id: Ie824b04fdaa80ebfa0ba1f0675cf08ede134be12
2015-10-22 19:31:20 -07:00
92adb669da
Don\'t add cells to FocusLogic sparse matrix if they aren\'t focusable.
...
am: df315180f0
2015-10-22 01:12:49 +00:00
df315180f0
Don't add cells to FocusLogic sparse matrix if they aren't focusable.
...
Previously, any child of ShortcutAndWidgetContainer was added to the
matrix, causing widgets (which aren't focusable) to be considered as
potential targets to gain focus when an arrow key was pressed. But if
the algorithm chose them, they couldn't take the focus so nothing
happened (i.e. the focus stayed on the app/folder it was on before).
Bug: 25126768
Change-Id: Id55fc310f7f58fb8795cce51dcefe4fd1210f788
2015-10-21 17:50:22 -07:00
a98e210502
resolve merge conflicts of d5d7fa10af to ub-launcher3-master.
...
Change-Id: I324b1a9cd3c6dce1d5d3b14d3ef95f798e5bc243
2015-10-21 14:41:25 -07:00
d5d7fa10af
Merge "Hide the "Set Wallpaper" action bar when clicked." into ub-launcher3-burnaby-polish
2015-10-21 21:21:14 +00:00
6f0f35806f
Do not animate folder when it is closed while changing activity state
...
am: 935fca1857
2015-10-21 21:06:50 +00:00
eb804b6aac
Hide the "Set Wallpaper" action bar when clicked.
...
This already happens everywhere except for the case where an external
app such as Photos started the wallpaper picker. So not only is this
more consistent, it also prevents crashes and other potential issues
caused by clicking "Set Wallpaper" too many times.
Bug: 25026717
Change-Id: I63c6a0ce68656e6e68094e88074a836d8c1034f9
2015-10-21 21:01:54 +00:00
935fca1857
Do not animate folder when it is closed while changing activity state
...
Bug: 21733536
Change-Id: I36aa3041b9300c917e320b511e00a1721e44f854
2015-10-21 13:42:36 -07:00
eef443248a
Set search bar height before setting up views in Launcher.
...
This ensures that the QSB widget options are set correctly the first
time they are used.
Bug: 24704753
Change-Id: I2bb13ff012b6f13ca076deed61f0b08a7037e2fa
2015-10-21 12:20:31 -07:00
b644780148
Import translations. DO NOT MERGE am: 6ce85953ac -s ours
...
am: 56070d4b67
2015-10-21 15:58:40 +00:00
56070d4b67
Import translations. DO NOT MERGE
...
am: 6ce85953ac
2015-10-21 15:54:05 +00:00
cf1c119f93
Import translations. DO NOT MERGE
...
am: 8a9f7abcf1
2015-10-21 15:53:42 +00:00
5d17d48f61
Import translations. DO NOT MERGE
...
Change-Id: I24307dd5e2545f212c8be8cf6c1af303530ac051
Auto-generated-cl: translation import
2015-10-21 08:04:52 -07:00
8a9f7abcf1
Import translations. DO NOT MERGE
...
Change-Id: I4f645e8f071559ad56ee7963934f1039b06d6e96
Auto-generated-cl: translation import
2015-10-21 08:03:43 -07:00
6ce85953ac
Import translations. DO NOT MERGE
...
Change-Id: I1cea6130293678ef0d5da961d11428f14e62ee25
Auto-generated-cl: translation import
2015-10-21 08:02:37 -07:00
cd32035203
Merge "Fixing disabled icon getting changed back to normal state on long press" into ub-launcher3-burnaby-polish
...
am: 5c6f99e290
2015-10-21 00:21:47 +00:00
5c6f99e290
Merge "Fixing disabled icon getting changed back to normal state on long press" into ub-launcher3-burnaby-polish
2015-10-21 00:18:25 +00:00
0b9aec98f4
Fix regression where keyboard couldn\'t switch between workspace pages.
...
am: c2bc0ef1c3
2015-10-20 23:49:58 +00:00
c2bc0ef1c3
Fix regression where keyboard couldn't switch between workspace pages.
...
Bug: 25122302
Change-Id: Id1d7628753ce7ef37af50e8594e541dcb6bea13e
2015-10-20 16:24:53 -07:00
cd5b7f9fc6
Fixing disabled icon getting changed back to normal state on long press
...
Change-Id: I4f35c1cbecfef7891f8b1187ba3be0af695d4fd5
2015-10-20 15:52:48 -07:00
dc4fd457bb
Fixing ConcurrentModificationException in tests am: ec7c9178dd
...
am: 93229c40bc
2015-10-20 18:24:07 +00:00
93229c40bc
Fixing ConcurrentModificationException in tests
...
am: ec7c9178dd
2015-10-20 18:05:22 +00:00
d249748abf
Making all provider calls using content resolver.
...
This will allow us to easily move db creation out of onCreate
Change-Id: Idd949624b0a9c95e4451e48db7764b7b7922c40a
2015-10-20 11:04:44 -07:00
f912beb2ee
resolve merge conflicts of fe3db428ab to ub-launcher3-master.
...
Change-Id: Icc60a61f621fefe9db67b178921e62f7d72d7e5a
2015-10-20 10:37:15 -07:00
ec7c9178dd
Fixing ConcurrentModificationException in tests
...
Change-Id: I7aabc62aa249dae979366ce2871604f5822f3139
2015-10-20 10:31:09 -07:00
fe3db428ab
Merge "Refactoring getPreferenceKey method" into ub-launcher3-burnaby-polish
2015-10-20 17:17:08 +00:00
38ac73a095
Using UiSelector instead of BySelector
...
am: ead4ab9655
2015-10-20 17:02:33 +00:00
f725824fa2
Refactoring getPreferenceKey method
...
This method was returnning a constant and getting inlined by proguard.
Change-Id: I87348e25b21483adc1b27d16f99dec4b73205701
2015-10-20 09:41:04 -07:00
4cf04e2bac
Import translations. DO NOT MERGE am: 2c29ac6eb5 -s ours am: b58e5fbc57 -s ours am: 2aa01afb35 -s ours am: 25c42a0937 -s ours am: a34c8cc2ba -s ours am: 446b98f4e4 -s ours am: 90022fd4c9 -s ours am: 2473783bbd -s ours am: 14ac721939 -s ours am: f630789246 -s ours
...
am: 04ad7785a7
2015-10-20 03:30:43 +00:00
ee940178a7
am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6 -s ours am: 8a901a6133 -s ours am: 6cf8795a68 -s ours am: 2d714406cd -s ours am: ed94b5520d -s ours am: 3e1c84ad8c -s ours am: 4c6f47c15e -s ours am: f4dd532c3e -s ours am: 9c26a98ebf -s ours am: 9d5a25ea2b -s ours
...
am: 0ef0c8e5c8
2015-10-20 03:30:39 +00:00
9ebe78cb40
Import translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours am: 8eef658cf9 -s ours am: 1e6e698881 -s ours am: cfb6dac38f -s ours am: 5168f039b3 -s ours am: 83e41764c1 -s ours am: e0342fad73 -s ours am: 10873a6d78 -s ours am: 57f4c5caec -s ours
...
am: 6c9c94c595
2015-10-20 03:30:35 +00:00
3a76f03127
Import translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours am: 5b53a47d02 -s ours am: 9b7386403a -s ours am: 994502244e -s ours am: 2573cb9c33 -s ours am: 1e52e4df04 -s ours am: 0df33c9132 -s ours am: 83e8ec10d8 -s ours am: aa2a2eaa00 -s ours
...
am: e4fcefcd44
2015-10-20 03:30:31 +00:00
5ca8e8b285
Import translations. DO NOT MERGE am: 01614d6ba5 -s ours am: 8454595cf3 -s ours am: 3f3f0fbc02 -s ours am: 2693dd2cd9 -s ours am: 1edcac1745 -s ours am: dc4f328c4d -s ours am: 7cdd35ca3c -s ours am: 03612b0a04 -s ours am: 188a1c0d1a -s ours am: 4164d8a8dc -s ours
...
am: 07b3422a48
2015-10-20 03:30:28 +00:00
1c2a4682d1
Import translations. DO NOT MERGE am: c4d66cf035 -s ours am: 3209b2bc4d -s ours am: 69830841ec -s ours am: 4baaf3241f -s ours am: 5148e0d456 -s ours am: 21abe0d9f7 -s ours am: 9c2588976f -s ours am: d487fcd435 -s ours am: f072358f7e -s ours am: 3c069c2f34 -s ours
...
am: e3be94b883
2015-10-20 03:30:24 +00:00
965c3c7043
am ddaac40d: am aebea1b0: keep history after reset to ub-now-lunchbox-release@1069658 am: 7fd445f4cc am: 5d6886a1cf am: 38bd557502 am: 0442deaee7 am: 5793b647fd am: f351d2d274 am: cf067a9a44 am: 4d31a0b5f1 am: 4075264811 am: fe90966e40
...
am: f8482775ab
2015-10-20 03:30:20 +00:00
e3a17f09ec
am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 149268d869 am: 70aa099f23 am: eadf9b6782 am: 24483f0498 am: a107ef6e13 am: f7f8df9f7c am: 94fd0e00d1 am: 12a5698507 am: b8b5e8d796 am: d1ae932f74
...
am: 736c9f40d2
2015-10-20 03:30:16 +00:00
da8fa0c630
am 32e4344a: am a2bc3772: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: b1a081221e am: 1bd8f7e460 am: 7661d33379 am: 7e5ec74df0 am: 84138b1523 am: e90e2b89bb am: 26e7cd5b94 am: 29adb8de49 am: 76494fd9a0 am: b38a6a864a
...
am: 7f5957cddd
2015-10-20 03:30:13 +00:00
faf8f20ce4
am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: fb1a32a63d am: 27b99c86e9 am: 078afac399 am: 94b7ee378f am: 6b7a1631f6 am: 753cf130b9 am: bbf5c27346 am: 63251de093 am: 18cd7c97b8 am: ccbed080dd
...
am: 9581d43bf1
2015-10-20 03:30:09 +00:00
b09781befd
am a4d0ef3c: am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 64b83ce632 am: 346da07c80 am: 78a44d4726 am: 8abc959461 am: 6060c10580 am: 9d494757cf am: daf82e6d8c am: d8b2144af4 am: 387a4ffab2 am: fb449aa7a1
...
am: d7758f309e
2015-10-20 03:30:05 +00:00
502803ff07
am 48e725bd: am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: d5da3cc1d8 am: 7748c94d25 am: 4396cc1fff am: a267cb6dde am: f289060a04 am: 3b678d2e58 am: e147ed8705 am: 83163c5011 am: fa4fbc1653 am: 4d97fef5f7
...
am: 5c15f15431
2015-10-20 03:30:01 +00:00
7f79c2fd2a
am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 524ed6adda am: 3f39cc45d8 am: 6120e6096a am: d9ba2b56db am: 8dc63a93c6 am: b897ea777e am: f5e5e1270d am: eaccb5a5b4 am: e3ee81540c am: 0a7d61f5e3
...
am: 2cc2701717
2015-10-20 03:29:58 +00:00
f4c8b173b2
am 6508fe1b: am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 0274f0a568 am: cb168d34ae am: 616facd74b am: 4c5dbc52b3 am: ed0c3623a9 am: bf4e852f95 am: 5c02e22455 am: 982cbc361c am: b8ec169116 am: 70b9ea23ea
...
am: 514720e86b
2015-10-20 03:29:54 +00:00
bf3fccd078
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 5cc929caa0 am: 5c597e4aba am: 1dda00996a am: b523cc1e4f am: 622880c0b9 am: 65f484b1fc am: 7c811ecaaf am: 9c0a25b58c am: 983daa1abc am: cbe3d95513
...
am: 98beed36bb
2015-10-20 03:29:50 +00:00
7e96669122
keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65 am: dcc908e147 -s ours am: af265461f1 am: 9d06c95c57 am: 292c2f7174 am: 6f1ea9e555
...
am: 3e52f9b020
2015-10-20 03:29:47 +00:00
04ad7785a7
Import translations. DO NOT MERGE am: 2c29ac6eb5 -s ours am: b58e5fbc57 -s ours am: 2aa01afb35 -s ours am: 25c42a0937 -s ours am: a34c8cc2ba -s ours am: 446b98f4e4 -s ours am: 90022fd4c9 -s ours am: 2473783bbd -s ours am: 14ac721939 -s ours
...
am: f630789246
2015-10-20 03:28:51 +00:00
0ef0c8e5c8
am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6 -s ours am: 8a901a6133 -s ours am: 6cf8795a68 -s ours am: 2d714406cd -s ours am: ed94b5520d -s ours am: 3e1c84ad8c -s ours am: 4c6f47c15e -s ours am: f4dd532c3e -s ours am: 9c26a98ebf -s ours
...
am: 9d5a25ea2b
2015-10-20 03:28:47 +00:00
6c9c94c595
Import translations. DO NOT MERGE am: c81b0617a6 -s ours am: 431d174f26 -s ours am: 8eef658cf9 -s ours am: 1e6e698881 -s ours am: cfb6dac38f -s ours am: 5168f039b3 -s ours am: 83e41764c1 -s ours am: e0342fad73 -s ours am: 10873a6d78 -s ours
...
am: 57f4c5caec
2015-10-20 03:28:43 +00:00
e4fcefcd44
Import translations. DO NOT MERGE am: 81403969d1 -s ours am: bbe424e584 -s ours am: 5b53a47d02 -s ours am: 9b7386403a -s ours am: 994502244e -s ours am: 2573cb9c33 -s ours am: 1e52e4df04 -s ours am: 0df33c9132 -s ours am: 83e8ec10d8 -s ours
...
am: aa2a2eaa00
2015-10-20 03:28:39 +00:00
Sunny Goyal
Tony Wickham
Daniel Weis
Geoff Mendal
Baligh Uddin
Huy Nguyen
Mark Ashdown
Mathew Inwood
Juan Silveira
Anton Hansson
Adam Skory