Commit Graph

78507 Commits

Author SHA1 Message Date
Sunny Goyal 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
Tony Wickham 0b9aec98f4 Fix regression where keyboard couldn\'t switch between workspace pages.
am: c2bc0ef1c3

* commit 'c2bc0ef1c313698fd931fc84ec2f11882c38cdba':
  Fix regression where keyboard couldn't switch between workspace pages.
2015-10-20 23:49:58 +00:00
Tony Wickham c2bc0ef1c3 Fix regression where keyboard couldn't switch between workspace pages.
Bug: 25122302
Change-Id: Id1d7628753ce7ef37af50e8594e541dcb6bea13e
2015-10-20 16:24:53 -07:00
Sunny Goyal cd5b7f9fc6 Fixing disabled icon getting changed back to normal state on long press
Change-Id: I4f35c1cbecfef7891f8b1187ba3be0af695d4fd5
2015-10-20 15:52:48 -07:00
Sunny Goyal dc4fd457bb Fixing ConcurrentModificationException in tests am: ec7c9178dd
am: 93229c40bc

* commit '93229c40bc1cf31c9864a6e4948b8479790345bc':
  Fixing ConcurrentModificationException in tests
2015-10-20 18:24:07 +00:00
Sunny Goyal 93229c40bc Fixing ConcurrentModificationException in tests
am: ec7c9178dd

* commit 'ec7c9178dd1f17cf8479acd4e0b4575a91cfb255':
  Fixing ConcurrentModificationException in tests
2015-10-20 18:05:22 +00:00
Sunny Goyal 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
Sunny Goyal f912beb2ee resolve merge conflicts of fe3db428ab to ub-launcher3-master.
Change-Id: Icc60a61f621fefe9db67b178921e62f7d72d7e5a
2015-10-20 10:37:15 -07:00
Sunny Goyal ec7c9178dd Fixing ConcurrentModificationException in tests
Change-Id: I7aabc62aa249dae979366ce2871604f5822f3139
2015-10-20 10:31:09 -07:00
Sunny Goyal fe3db428ab Merge "Refactoring getPreferenceKey method" into ub-launcher3-burnaby-polish 2015-10-20 17:17:08 +00:00
Sunny Goyal 38ac73a095 Using UiSelector instead of BySelector
am: ead4ab9655

* commit 'ead4ab9655683050a967864a3213d8782be0344c':
  Using UiSelector instead of BySelector
2015-10-20 17:02:33 +00:00
Sunny Goyal 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
Baligh Uddin 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  -s ours

* commit '04ad7785a7738fef4874525308a29eb55a793a2b':
  Import translations. DO NOT MERGE
2015-10-20 03:30:43 +00:00
Baligh Uddin 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  -s ours

* commit '0ef0c8e5c89479b02a98c57df44416d7b0bc7d5b':
  Import translations. DO NOT MERGE
2015-10-20 03:30:39 +00:00
Baligh Uddin 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  -s ours

* commit '6c9c94c5959355a75821b4f253d420339fe6f874':
  Import translations. DO NOT MERGE
2015-10-20 03:30:35 +00:00
Baligh Uddin 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  -s ours

* commit 'e4fcefcd446f756f903ef8a2d904777ea2dd4ed3':
  Import translations. DO NOT MERGE
2015-10-20 03:30:31 +00:00
Baligh Uddin 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  -s ours

* commit '07b3422a481a3ea8283f50364facac4e9d24c152':
  Import translations. DO NOT MERGE
2015-10-20 03:30:28 +00:00
Baligh Uddin 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  -s ours

* commit 'e3be94b88300c768159547909491a930388cf713':
  Import translations. DO NOT MERGE
2015-10-20 03:30:24 +00:00
Baligh Uddin 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

* commit 'f8482775ab06f7f7431f2723421b09c096bd4bbb':
2015-10-20 03:30:20 +00:00
Huy Nguyen 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

* commit '736c9f40d25dd2123e36561d6399c2bdb0b50184':
2015-10-20 03:30:16 +00:00
Mark Ashdown 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

* commit '7f5957cddd59add2ed48f84a46415be3c64ea3c0':
2015-10-20 03:30:13 +00:00
Huy Nguyen 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

* commit '9581d43bf1a1aa12170fb05d7fe33d3dbbe7cc18':
2015-10-20 03:30:09 +00:00
Mark Ashdown 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

* commit 'd7758f309eb36cd8ed7ecfee2e0fa234d871be50':
2015-10-20 03:30:05 +00:00
Mathew Inwood 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

* commit '5c15f154313e55eee162836bc73f4c9567a7014c':
2015-10-20 03:30:01 +00:00
Juan Silveira 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

* commit '2cc27017178a24ddcf573dc7430032a8a82a3b08':
2015-10-20 03:29:58 +00:00
Anton Hansson 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

* commit '514720e86b47c903acf47154ad5b2507a9bd6509':
2015-10-20 03:29:54 +00:00
Adam Skory 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

* commit '98beed36bb4c0c813aabdf24e5b9a9dc0964346b':
2015-10-20 03:29:50 +00:00
Baligh Uddin 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

* commit '3e52f9b020e14f3aecf5c9ea71f767de7470a7f6':
2015-10-20 03:29:47 +00:00
Baligh Uddin 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  -s ours

* commit 'f630789246e5782b05d5f4035d72ffe256e7abae':
  Import translations. DO NOT MERGE
2015-10-20 03:28:51 +00:00
Baligh Uddin 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  -s ours

* commit '9d5a25ea2b3a1421f984366e76f96e893347f7fe':
  Import translations. DO NOT MERGE
2015-10-20 03:28:47 +00:00
Baligh Uddin 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  -s ours

* commit '57f4c5caec1195fb9aed5085009733c8f6f43245':
  Import translations. DO NOT MERGE
2015-10-20 03:28:43 +00:00
Baligh Uddin 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  -s ours

* commit 'aa2a2eaa00bf130bef1e1d77a84079215bc88605':
  Import translations. DO NOT MERGE
2015-10-20 03:28:39 +00:00
Baligh Uddin 07b3422a48 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

* commit '4164d8a8dc8542a37fed4e818c47bb3e749f460a':
  Import translations. DO NOT MERGE
2015-10-20 03:28:36 +00:00
Baligh Uddin e3be94b883 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

* commit '3c069c2f340ad02fabdc93eabf5c5dbb4aca22d1':
  Import translations. DO NOT MERGE
2015-10-20 03:28:32 +00:00
Baligh Uddin f8482775ab 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

* commit 'fe90966e409204eba248ebf9dd7561b7556c51fe':
2015-10-20 03:28:28 +00:00
Huy Nguyen 736c9f40d2 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

* commit 'd1ae932f741c543be89fc7cff8cf1a803132ecde':
2015-10-20 03:28:25 +00:00
Mark Ashdown 7f5957cddd 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

* commit 'b38a6a864a5050c7dbac9836c58a5bdb106b8339':
2015-10-20 03:28:21 +00:00
Huy Nguyen 9581d43bf1 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

* commit 'ccbed080dddb7bf5095cb4b8de6b9dc75e0c1f61':
2015-10-20 03:28:17 +00:00
Mark Ashdown d7758f309e 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

* commit 'fb449aa7a1eb6fad4e17d9875629077eb81c5609':
2015-10-20 03:28:14 +00:00
Mathew Inwood 5c15f15431 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

* commit '4d97fef5f735d10acb47168115f22e7a4d3efa1c':
2015-10-20 03:28:10 +00:00
Juan Silveira 2cc2701717 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

* commit '0a7d61f5e3d62f42b06b0da736cc9dd60dadd579':
2015-10-20 03:28:06 +00:00
Anton Hansson 514720e86b 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

* commit '70b9ea23ea609ea4d442c70dcd002233262274f3':
2015-10-20 03:28:03 +00:00
Adam Skory 98beed36bb 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

* commit 'cbe3d95513a19cb2966e760db329afed5953c4b8':
2015-10-20 03:27:59 +00:00
Baligh Uddin 3e52f9b020 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

* commit '6f1ea9e5553e43d72598382b3d594119702bdde7':
2015-10-20 03:27:56 +00:00
Baligh Uddin f630789246 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

* commit '14ac721939d769f15a4a605955c533197b2ac627':
  Import translations. DO NOT MERGE
2015-10-20 03:26:44 +00:00
Baligh Uddin 9d5a25ea2b 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

* commit '9c26a98ebf6052cd37c90a5abeb1df8d23158905':
  Import translations. DO NOT MERGE
2015-10-20 03:26:40 +00:00
Baligh Uddin 57f4c5caec 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

* commit '10873a6d7828c8204b0397198c6e5d4c0d044ed1':
  Import translations. DO NOT MERGE
2015-10-20 03:26:36 +00:00
Baligh Uddin aa2a2eaa00 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

* commit '83e8ec10d830e3d6d3ebe6b7a4dda7b25c0a4a6d':
  Import translations. DO NOT MERGE
2015-10-20 03:26:33 +00:00
Baligh Uddin 4164d8a8dc 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

* commit '188a1c0d1a545254e190e2fc6e09a77f54db1a4f':
  Import translations. DO NOT MERGE
2015-10-20 03:26:29 +00:00
Baligh Uddin 3c069c2f34 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

* commit 'f072358f7ed09e032e908564f636472e4af1e3be':
  Import translations. DO NOT MERGE
2015-10-20 03:26:26 +00:00