Chris Wren
038bfdccbd
am f0481bf3: Merge "add a proto decoder host utility" into jb-ub-now-indigo-rose
...
* commit 'f0481bf3c9571dd7f6ec734f400706ea6439766c':
add a proto decoder host utility
2013-10-03 15:31:08 -07:00
Tom Stamm
67a40e08c6
am 339b0ec9: Merge "Trying to come up with a simpler approach for onShow/onHide." into jb-ub-now-indigo-rose
...
* commit '339b0ec914d4ec3863aba1cba7329a2e69a308e2':
Trying to come up with a simpler approach for onShow/onHide.
2013-10-03 15:30:57 -07:00
Chris Wren
be7049a99c
am c95c80d1: Merge "backup widget assets." into jb-ub-now-indigo-rose
...
* commit 'c95c80d13793972eebc61520497fc0dad03838e7':
backup widget assets.
2013-10-03 15:30:57 -07:00
Daniel Sandler
197e309873
am 57dac26f: Add support for <include> in workspace XML.
...
* commit '57dac26fe08bfd04603a96c4aec615336b38b4d9':
Add support for <include> in workspace XML.
2013-10-03 15:30:57 -07:00
Baligh Uddin
7881f431f4
am e0916aec: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose
...
* commit 'e0916aec7d5d1d83c8ef09c5e8310f05acc568bb':
Import translations. DO NOT MERGE
2013-10-03 15:00:11 -07:00
Winson Chung
1f24b14a6a
am 45cab39e: Tweaking the front cling to support more verbose languages. (Bug 11015051)
...
* commit '45cab39eea097bf622cd1ed67d91d2336d78663a':
Tweaking the front cling to support more verbose languages. (Bug 11015051)
2013-10-03 15:00:03 -07:00
Adam Cohen
b8a40751c7
am d3f333b9: Merge "Updating all-apps button (issue 11030678)" into jb-ub-now-indigo-rose
...
* commit 'd3f333b995c038c5171478ef56dc6c1c6e780b39':
Updating all-apps button (issue 11030678)
2013-10-03 14:59:23 -07:00
Winson Chung
e3286352ab
am 6706ed82: Updating widget preview tile.
...
* commit '6706ed826600683cd66a7a2af79137d9fdda34f8':
Updating widget preview tile.
2013-10-03 14:59:20 -07:00
Chris Wren
0f45c898b0
am 136c1763: Merge "backup launcher icons" into jb-ub-now-indigo-rose
...
* commit '136c17631d8bfe51caa614252abb2049393aa139':
backup launcher icons
2013-10-03 14:59:15 -07:00
Chris Wren
f0481bf3c9
Merge "add a proto decoder host utility" into jb-ub-now-indigo-rose
2013-10-03 20:54:28 +00:00
Tom Stamm
339b0ec914
Merge "Trying to come up with a simpler approach for onShow/onHide." into jb-ub-now-indigo-rose
2013-10-03 20:38:12 +00:00
Chris Wren
c95c80d137
Merge "backup widget assets." into jb-ub-now-indigo-rose
2013-10-03 19:39:31 +00:00
Adam Cohen
da5d3b7f6e
am 40d6264a: Merge "Fix ArrayIndexOutOfBoundsException, (issue 11038649)" into jb-ub-now-indigo-rose
...
* commit '40d6264a8e1a29b0f11a03fff39db1dc7f967088':
Fix ArrayIndexOutOfBoundsException, (issue 11038649)
2013-10-03 10:34:16 -07:00
Allan Wojciechowski
4aa7df63b5
am fdc4302b: Don\'t animate showWorkspaceAndExitOverviewMode
...
* commit 'fdc4302bfa9b0ff65403006a89872f4a523fa825':
Don't animate showWorkspaceAndExitOverviewMode
2013-10-03 10:33:43 -07:00
Daniel Sandler
57dac26fe0
Add support for <include> in workspace XML.
...
Note that this doesn't honor folder nesting (that is, you
can't include an XML file full of shortcuts inside a
<folder> node and expect them all to appear in that folder).
It's really just a way to concatenate/overlay multiple XML
files, making it easier to make a few tweaks/additions for
certain screen sizes or locales.
Bug: 10932771
Change-Id: I1fc29477d0717a8a7bc116f16729a955e6c625d5
2013-10-03 13:28:36 -04:00
Chris Wren
2b6c21d434
add a proto decoder host utility
...
Bug: 10778984
Change-Id: I1c0203a3a5b3a3b1e565af387ccdfa92b53f8335
2013-10-03 12:57:53 -04:00
Chris Wren
fd13c714f4
backup widget assets.
...
Bug: 10778984
Change-Id: I842a88c517401fa4eb3798fd03e0fbc3634e3144
2013-10-03 12:57:52 -04:00
Baligh Uddin
e0916aec7d
Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose
2013-10-03 04:06:24 +00:00
Baligh Uddin
90ec376f47
Import translations. DO NOT MERGE
...
Change-Id: I3ab2f73a7614fd2dbe418f20c23d6a5e069b544b
Auto-generated-cl: translation import
2013-10-02 18:01:20 -07:00
Baligh Uddin
39e36317e1
Import translations. DO NOT MERGE
...
Change-Id: I3786db949ea5e8884fd056e7d820f341251afc20
Auto-generated-cl: translation import
2013-10-02 18:00:15 -07:00
Adam Cohen
6fecd410e8
Trying to come up with a simpler approach for onShow/onHide.
...
-> In this approach, the shown/hidden state should be tracked
by the CustomContent provider and excess calls to onShow and onHide
should be debounced. That is, if onShow is called twice in a row,
without an intermediate onHide, the second should be discarded.
Viceversa for onHide.
Change-Id: I2fa48d15f28767775a9a9cb84c1d920867a12176
2013-10-02 17:58:53 -07:00
Winson Chung
45cab39eea
Tweaking the front cling to support more verbose languages. (Bug 11015051)
2013-10-02 17:45:32 -07:00
Adam Cohen
d3f333b995
Merge "Updating all-apps button (issue 11030678)" into jb-ub-now-indigo-rose
2013-10-02 18:56:30 +00:00
Adam Cohen
7f76a00896
Updating all-apps button (issue 11030678)
...
Change-Id: I62b49ed5225a3859d843d3fa27ef96b341eb7845
2013-10-02 11:56:04 -07:00
Winson Chung
6706ed8266
Updating widget preview tile.
2013-10-02 11:00:28 -07:00
Chris Wren
136c17631d
Merge "backup launcher icons" into jb-ub-now-indigo-rose
2013-10-02 17:12:13 +00:00
Adam Cohen
40d6264a8e
Merge "Fix ArrayIndexOutOfBoundsException, (issue 11038649)" into jb-ub-now-indigo-rose
2013-10-02 16:47:23 +00:00
Adam Cohen
1f1f45d620
Fix ArrayIndexOutOfBoundsException, (issue 11038649)
...
Change-Id: Ib7aa55b104894f12175b382fdbcfb08d95408699
2013-10-02 09:44:13 -07:00
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
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