Commit Graph

49925 Commits

Author SHA1 Message Date
Allan Wojciechowski fdc4302bfa Don't animate showWorkspaceAndExitOverviewMode
We shouldn't animate from here as this only gets called when
transitioning to the custom content screen and we shouldn't
animate exiting overview mode.

Bug: 10849624
Change-Id: I1309f2ed1f89a20a9e7b7a2fb5aec47b01f222ab
2013-10-02 11:15:27 -04:00
Adam Cohen f8eb28cd64 am 6957a8d7: am 044db335: Merge "Making sure overview mode can\'t get stuck (issue 11022017)" into jb-ub-now-indigo-rose
* commit '6957a8d7112fd2f9d9df9cb51376b3fc67230d06':
  Making sure overview mode can't get stuck (issue 11022017)
2013-10-02 06:58:34 -07:00
Adam Cohen bff515401d am 32655b2c: am 20df4f87: Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose
* commit '32655b2c1f3bd587ad6d8e8b5948f0d6facc06bf':
  Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)
2013-10-02 06:58:34 -07:00
Winson Chung a4c6fa59f4 am 7c2e2894: am ba4e52f4: Updating page indicator assets.
* commit '7c2e289461b3108a37c1a2aa04f833763461b21a':
  Updating page indicator assets.
2013-10-02 06:58:33 -07:00
Chris Craik d75f95adb5 am 2ef571da: am a8c1906a: Merge "Disable hardware layer on custom screen" into jb-ub-now-indigo-rose
* commit '2ef571da1e4c71f0c39b73b17f12f5bf80629899':
  Disable hardware layer on custom screen
2013-10-02 06:58:31 -07:00
Adam Cohen 1ab462c3bf am 02dd85c6: am c60777ad: Merge "Upping icon font size. (Bug 10909316)" into jb-ub-now-indigo-rose
* commit '02dd85c6abb0ce1518d39b83dae37ed74b761112':
  Upping icon font size. (Bug 10909316)
2013-10-02 06:58:31 -07:00
Adam Cohen 3c326cf800 am 156fbff4: am 7f331b6b: Merge "Change folder icon item overlay to white (issue 11030725)" into jb-ub-now-indigo-rose
* commit '156fbff4a2afaddf078282d23b53375f2caad3df':
  Change folder icon item overlay to white (issue 11030725)
2013-10-02 06:58:17 -07:00
Dave Hawkey 240946d7c8 am c91d28ba: am c6be6eec: Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose
* commit 'c91d28ba55a217c8086755dbae0936f6d1b27306':
  Fix NPE if workspace is not created yet
2013-10-02 06:58:17 -07:00
Adam Cohen 19cd84351f am 625863ef: am 9cfd5863: Merge "Toning down overscroll overlay (issue 11023942)" into jb-ub-now-indigo-rose
* commit '625863ef3a3adf111456cc1e657a7a70a091f85a':
  Toning down overscroll overlay (issue 11023942)
2013-10-02 06:58:17 -07:00
Michael Jurka 1d51c21a2e am aa79c90c: am 9643e2e5: Merge "Make some changes for transparent system bars" into jb-ub-now-indigo-rose
* commit 'aa79c90ce2b5476c01f959633fc4c36b5fa64ed1':
  Make some changes for transparent system bars
2013-10-02 06:58:16 -07:00
Adam Cohen 6522958d2e am f78729e7: am 8cacf102: Merge "Tweaking clings again to support smaller folders (Bug 10965184)" into jb-ub-now-indigo-rose
* commit 'f78729e732af1979b46285b856e8cc78197715c5':
  Tweaking clings again to support smaller folders (Bug 10965184)
2013-10-02 06:58:16 -07:00
Adam Cohen ee5b470b34 am b8f7475c: am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose
* commit 'b8f7475c32627a53bf23b914cd904b4f2e9dff57':
  Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
2013-10-02 06:58:15 -07:00
Adam Cohen 6957a8d711 am 044db335: Merge "Making sure overview mode can\'t get stuck (issue 11022017)" into jb-ub-now-indigo-rose
* commit '044db335abfebb4a3c3ebc82d40d157c73b7f8cb':
  Making sure overview mode can't get stuck (issue 11022017)
2013-10-02 05:59:24 -07:00
Adam Cohen 32655b2c1f am 20df4f87: Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose
* commit '20df4f87ec69e34f62bf15c7e3078db479fbfdd7':
  Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)
2013-10-02 05:59:24 -07:00
Winson Chung 7c2e289461 am ba4e52f4: Updating page indicator assets.
* commit 'ba4e52f41c961c19b0c8592e84af7d1c51dd03b2':
  Updating page indicator assets.
2013-10-02 05:59:23 -07:00
Chris Craik 2ef571da1e am a8c1906a: Merge "Disable hardware layer on custom screen" into jb-ub-now-indigo-rose
* commit 'a8c1906a9d318f428d2022b7d732c0c7e029a96d':
  Disable hardware layer on custom screen
2013-10-02 05:59:23 -07:00
Adam Cohen 02dd85c6ab am c60777ad: Merge "Upping icon font size. (Bug 10909316)" into jb-ub-now-indigo-rose
* commit 'c60777ad4dfa6d55c20e9ad772495426f65c2f37':
  Upping icon font size. (Bug 10909316)
2013-10-02 05:59:22 -07:00
Adam Cohen 156fbff4a2 am 7f331b6b: Merge "Change folder icon item overlay to white (issue 11030725)" into jb-ub-now-indigo-rose
* commit '7f331b6bed657334df6a0372f548d951f42067af':
  Change folder icon item overlay to white (issue 11030725)
2013-10-02 05:59:22 -07:00
Dave Hawkey c91d28ba55 am c6be6eec: Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose
* commit 'c6be6eec2800e4908ef9b5ff86b8c185dfa19030':
  Fix NPE if workspace is not created yet
2013-10-02 05:59:22 -07:00
Adam Cohen 625863ef3a am 9cfd5863: Merge "Toning down overscroll overlay (issue 11023942)" into jb-ub-now-indigo-rose
* commit '9cfd586305826bb1da725cfd6956cf201195e692':
  Toning down overscroll overlay (issue 11023942)
2013-10-02 05:59:14 -07:00
Michael Jurka aa79c90ce2 am 9643e2e5: Merge "Make some changes for transparent system bars" into jb-ub-now-indigo-rose
* commit '9643e2e5757b1ac1ec028a4df2a0cfd2592132d5':
  Make some changes for transparent system bars
2013-10-02 05:59:11 -07:00
Adam Cohen f78729e732 am 8cacf102: Merge "Tweaking clings again to support smaller folders (Bug 10965184)" into jb-ub-now-indigo-rose
* commit '8cacf102eb0bd0d84f781b2db4722590398c0ed9':
  Tweaking clings again to support smaller folders (Bug 10965184)
2013-10-02 05:59:09 -07:00
Adam Cohen b8f7475c32 am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose
* commit 'e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f':
  Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
2013-10-02 05:58:57 -07:00
Chris Wren 22e130d401 backup launcher icons
Only allow a small number of icons to be backed up in any given pass.
Also refactor common code out of favorite and screen backups.

Bug: 10778984
Change-Id: I54bc769c1d1c1c9087ea4bc58f258bd15c167aea
2013-10-02 08:02:57 -04:00
Adam Cohen 044db335ab Merge "Making sure overview mode can't get stuck (issue 11022017)" into jb-ub-now-indigo-rose 2013-10-02 01:10:57 +00:00
Adam Cohen 7a9e58aa17 Making sure overview mode can't get stuck (issue 11022017)
Change-Id: Iee2088f8781d375b0b83625023fb125a869a2868
2013-10-01 18:05:53 -07:00
Adam Cohen 20df4f87ec Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose 2013-10-02 01:03:54 +00:00
Adam Cohen edaaa30232 Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)
Change-Id: I16f4f6a19cdc92af6b817a658dc32e082f08660c
2013-10-01 17:35:43 -07:00
Winson Chung ba4e52f41c Updating page indicator assets. 2013-10-01 17:22:26 -07:00
Chris Craik a8c1906a9d Merge "Disable hardware layer on custom screen" into jb-ub-now-indigo-rose 2013-10-02 00:16:36 +00:00
Adam Cohen c60777ad4d Merge "Upping icon font size. (Bug 10909316)" into jb-ub-now-indigo-rose 2013-10-01 23:32:38 +00:00
Winson Chung 2651d13422 Upping icon font size. (Bug 10909316)
Change-Id: Iafc29b0b0eb98d51c9a03babff37d1dfdd53d9e0
2013-10-01 16:28:15 -07:00
Adam Cohen 7f331b6bed Merge "Change folder icon item overlay to white (issue 11030725)" into jb-ub-now-indigo-rose 2013-10-01 23:14:02 +00:00
Adam Cohen 433766dcb8 Change folder icon item overlay to white (issue 11030725)
Change-Id: I119cd06211722f86f901eb08ee9f7d1d9903e4ea
2013-10-01 16:13:42 -07:00
Dave Hawkey c6be6eec28 Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose 2013-10-01 22:56:47 +00:00
Chris Craik 01f2d7fa4b Disable hardware layer on custom screen
Whereas standard ShortcutAndWidgetContainers are static during screen
transition, the custom screen may animate during its transition.
Disabling the hardware layer reduces the cost of this animation
significantly.

bug:10810505

Change-Id: I560d209f651951f54c224862a706e8a243dc71af
2013-10-01 15:07:17 -07:00
Adam Cohen 9cfd586305 Merge "Toning down overscroll overlay (issue 11023942)" into jb-ub-now-indigo-rose 2013-10-01 19:42:53 +00:00
Adam Cohen 02dcfccb75 Toning down overscroll overlay (issue 11023942)
Change-Id: Ic019ca7b6f076236ec0b85f96446ec555e7bde1f
2013-10-01 12:38:07 -07:00
Michael Jurka 9643e2e575 Merge "Make some changes for transparent system bars" into jb-ub-now-indigo-rose 2013-10-01 19:16:06 +00:00
Adam Cohen 8cacf102eb Merge "Tweaking clings again to support smaller folders (Bug 10965184)" into jb-ub-now-indigo-rose 2013-10-01 19:08:18 +00:00
Michael Jurka 7267fa5869 Make some changes for transparent system bars
-Move transparent bars from just GEL to Launcher3
-When wallpaper strip animates, render it under the nav bar
-Disable rotation of wallpaper picker on phones

Bug: 10814785
Bug: 10852650
Bug: 10852554

Change-Id: I9efeccbc4ad1933689266a5dede201ccfd34acf4
2013-10-01 11:56:43 -07:00
Winson Chung 16de08e83e Tweaking clings again to support smaller folders (Bug 10965184)
Change-Id: I324d770fafd7db5d66a870f7825caeb6440ac467
2013-10-01 11:36:16 -07:00
Adam Cohen e269ca4298 Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose 2013-10-01 18:21:12 +00:00
Adam Cohen 97d5311e2a Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
Change-Id: Iba851c297ab9406b094c8f0cbf6e39675d0ffa39
2013-10-01 11:19:44 -07:00
Baligh Uddin d40b2e993f am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '4e4d65990ab6134f588330621fc594b0f33f0fb8':
  Import translations. DO NOT MERGE
2013-09-30 21:41:10 -07:00
Baligh Uddin 88b88fc5c3 Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit 2013-10-01 04:39:37 +00:00
Baligh Uddin 4e4d65990a Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic 2013-10-01 04:38:40 +00:00
Michael Jurka 090f4149cd am cc0086e4: am 1970614d: Merge "Restore parallax even if Google Now isn\'t present" into jb-ub-now-indigo-rose
* commit 'cc0086e4a4331762d81f17f7dcf6e55b4820193a':
  Restore parallax even if Google Now isn't present
2013-09-30 18:31:32 -07:00
Michael Jurka cc0086e4a4 am 1970614d: Merge "Restore parallax even if Google Now isn\'t present" into jb-ub-now-indigo-rose
* commit '1970614d0980699a6858a098dd1e13e65664ab47':
  Restore parallax even if Google Now isn't present
2013-09-30 18:29:50 -07:00
Michael Jurka 1970614d09 Merge "Restore parallax even if Google Now isn't present" into jb-ub-now-indigo-rose 2013-10-01 01:28:13 +00:00