Laurent Tu
dd549bcc29
Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev
2012-12-04 17:45:31 -08:00
Scott Main
b0ebd4e941
am 2fb9b61a: am 315557b0: am 78d17441: docs: fix broken link on maps page
...
* commit '2fb9b61a766a1faa0dca166c19f27cac58763f8d':
docs: fix broken link on maps page
2012-12-04 17:39:46 -08:00
Scott Main
2fb9b61a76
am 315557b0: am 78d17441: docs: fix broken link on maps page
...
* commit '315557b0154bc5fcfe79131a8092985d8fada6e2':
docs: fix broken link on maps page
2012-12-04 17:37:28 -08:00
Scott Main
315557b015
am 78d17441: docs: fix broken link on maps page
...
* commit '78d17441fadc38dc452871da722b1b2900de7a67':
docs: fix broken link on maps page
2012-12-04 17:36:00 -08:00
Scott Main
8b93e77c9d
am 1e94db6e: am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev
...
* commit '1e94db6ef9a43a6468bf7f4e64e3536cb87fbf5c':
docs: update webview guide with javascript interface info
2012-12-04 17:33:30 -08:00
Scott Main
78d17441fa
docs: fix broken link on maps page
...
Change-Id: I07e8129df1dcc61b0c2f7b81065092b06e31b8e8
2012-12-04 17:32:30 -08:00
Scott Main
1e94db6ef9
am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev
...
* commit '3341bde3d75ffe29a540af6b77051bb1afde08a2':
docs: update webview guide with javascript interface info
2012-12-04 17:31:22 -08:00
Scott Main
3341bde3d7
am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev
...
* commit 'fc677afec5ecae1844c0f46e381b9b7967d820b4':
docs: update webview guide with javascript interface info
2012-12-04 17:29:18 -08:00
Scott Main
cbb234e4b8
am 13bad174: am 8a1074d5: am 7550a393: docs: fix AI download links
...
* commit '13bad174f50abc6f782e5570809883e59bc15163':
docs: fix AI download links
2012-12-04 17:27:46 -08:00
Scott Main
fc677afec5
Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev
2012-12-04 17:25:58 -08:00
Scott Main
13bad174f5
am 8a1074d5: am 7550a393: docs: fix AI download links
...
* commit '8a1074d5500b16509687fa383e07f46cce996ce8':
docs: fix AI download links
2012-12-04 17:25:38 -08:00
Scott Main
8a1074d550
am 7550a393: docs: fix AI download links
...
* commit '7550a393e0bb7b5f75fd558c828653097723d201':
docs: fix AI download links
2012-12-04 17:23:39 -08:00
Jeff Brown
1edc61119d
am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
...
* commit '61e21940ffd643dad1aa6c7c3dc9933815aecd74':
Pin electron beam surface to natural orientation.
2012-12-04 17:21:00 -08:00
Jeff Brown
61e21940ff
am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
...
* commit '7fcb5dc5e9fbad0f183f425e88e576aaca98b0d7':
Pin electron beam surface to natural orientation.
2012-12-04 17:18:52 -08:00
Jeff Brown
7fcb5dc5e9
Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev
2012-12-04 17:15:34 -08:00
satok
8ec9f8f074
am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
...
* commit 'dc5b21a54850735bdfd1fbbd83375b2578ed4b02':
Fix an issue on installing 3rd-party IME by a non-primary user
2012-12-04 17:14:17 -08:00
satok
dc5b21a548
am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
...
* commit '487f8e93b0b5e2949fbfa6b60fd5e0a7a3e4d5b7':
Fix an issue on installing 3rd-party IME by a non-primary user
2012-12-04 17:12:10 -08:00
satok
487f8e93b0
Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
2012-12-04 17:09:57 -08:00
Scott Main
c0512832f4
am 231719fa: am fff0fb87: am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
...
* commit '231719fa9c22df02408c17444503b790c9f0d1b9':
update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
2012-12-04 16:47:32 -08:00
Scott Main
231719fa9c
am fff0fb87: am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
...
* commit 'fff0fb87271faf8f19d9fd062c5ebfb720204223':
update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
2012-12-04 16:45:25 -08:00
Scott Main
7550a393e0
docs: fix AI download links
...
Change-Id: I2773f0edf1dc73bee9b8ea1ca0e09a9fd85086ef
2012-12-04 16:44:27 -08:00
Scott Main
fff0fb8727
am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
...
* commit '82e1d979ff7d6571f124b00d4354d40aa8757664':
update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
2012-12-04 16:42:23 -08:00
Scott Main
82e1d979ff
update building first app class with some changes to eclipse workflow
...
and account for small differences when using an IDE other than eclipse
Change-Id: I1ea8a00cd3d03623a43d6b5f75234095130c0aa3
2012-12-04 16:38:18 -08:00
Glenn Kasten
8a18043436
Merge "new can't fail on Android"
2012-12-04 16:37:49 -08:00
Victoria Lease
6861e258f0
am 1d20e05e: am 82a76800: Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev
...
* commit '1d20e05e487faa02acca2dcb2ae9d527d097ce7d':
DO NOT MERGE Notify provider when disposing last UpdateRecord
2012-12-04 16:35:23 -08:00
Scott Main
5931fa81bd
am a8a19ac5: am 3b08bb9d: am f9861221: docs: delete gps overview page
...
* commit 'a8a19ac5ab6c0612fe0d5bcc10b84d585fcaf509':
docs: delete gps overview page
2012-12-04 16:35:20 -08:00
Raph Levien
8a3def6ef9
am 0da0d337: am a7acb4b9: Merge "Fix for bug 7467609 Bad rendering of Telugu text" into jb-mr1.1-dev
...
* commit '0da0d337752ea153fb0e9f5d73512060ff007f6d':
Fix for bug 7467609 Bad rendering of Telugu text
2012-12-04 16:35:16 -08:00
Sascha Prueter
98c958097b
am 8f7eddbe: am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev
...
* commit '8f7eddbef33f97e7d4439707ac0039be4c81ef0e':
PRIORITY_MIN notifications should be truly ambient.
2012-12-04 16:35:12 -08:00
Guang Zhu
32ec47c1b1
am 63cc22a5: am 4eab3d88: Merge "more app launch test tweaks" into jb-mr1.1-dev
...
* commit '63cc22a5c393fec725d271f5a7d82fb2fe05647f':
more app launch test tweaks
2012-12-04 16:35:09 -08:00
Scott Main
f54d82c810
am 639116f1: am 22ab700f: am beb08896: docs: add backup service to gp docs
...
* commit '639116f10550383be233cc8c00d96bb9bbfbc046':
docs: add backup service to gp docs
2012-12-04 16:35:06 -08:00
Winson Chung
46a1a4b2fe
am 8f90249d: am ca83e1d5: Merge "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" into jb-mr1.1-dev
...
* commit '8f90249de422b10f5661ac437dd57fc034ee6933':
Saving and restoring current page when rotating in lockscreen. (Bug 7568412)
2012-12-04 16:35:02 -08:00
Raph Levien
4cd6cef3af
am 70463dca: am 49ed5da3: Merge "Reorder tone mark and nikhahit in DroidSansThai.ttf" into jb-mr1.1-dev
...
* commit '70463dca7de2843908523348d6f97f075efe9632':
Reorder tone mark and nikhahit in DroidSansThai.ttf
2012-12-04 16:34:59 -08:00
John Spurlock
d201bf77be
am 9c902ca4: am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev
...
* commit '9c902ca4732f8c2a5afda4047415d1de6d3db493':
Kill dreams that do not create a timely service connection.
2012-12-04 16:34:55 -08:00
Glenn Kasten
1e821372be
Merge "Replace hard-coded sample rate values by constants"
2012-12-04 16:32:41 -08:00
Victoria Lease
1d20e05e48
am 82a76800: Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev
...
* commit '82a76800ad78b7aa6e2bde2f6512e4ffbe21873f':
DO NOT MERGE Notify provider when disposing last UpdateRecord
2012-12-04 16:32:18 -08:00
Scott Main
a8a19ac5ab
am 3b08bb9d: am f9861221: docs: delete gps overview page
...
* commit '3b08bb9d0886f0f6e258dcd8013ae6079063c31a':
docs: delete gps overview page
2012-12-04 16:32:14 -08:00
Raph Levien
0da0d33775
am a7acb4b9: Merge "Fix for bug 7467609 Bad rendering of Telugu text" into jb-mr1.1-dev
...
* commit 'a7acb4b9cdbf39b3456bd45ef82681716e1ab2f8':
Fix for bug 7467609 Bad rendering of Telugu text
2012-12-04 16:32:09 -08:00
Sascha Prueter
8f7eddbef3
am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev
...
* commit '652d8fc944c011eb15202f678588723aa9f38a84':
PRIORITY_MIN notifications should be truly ambient.
2012-12-04 16:32:05 -08:00
Guang Zhu
63cc22a5c3
am 4eab3d88: Merge "more app launch test tweaks" into jb-mr1.1-dev
...
* commit '4eab3d88a21b07d029a1b22271d7d1537a245266':
more app launch test tweaks
2012-12-04 16:31:58 -08:00
Scott Main
639116f105
am 22ab700f: am beb08896: docs: add backup service to gp docs
...
* commit '22ab700f3eb190e2599bb54bed5a7cfdb057f5ee':
docs: add backup service to gp docs
2012-12-04 16:31:54 -08:00
Winson Chung
8f90249de4
am ca83e1d5: Merge "Saving and restoring current page when rotating in lockscreen. (Bug 7568412)" into jb-mr1.1-dev
...
* commit 'ca83e1d5410d12220d48b8c52ed06cfb52fb9868':
Saving and restoring current page when rotating in lockscreen. (Bug 7568412)
2012-12-04 16:31:49 -08:00
Raph Levien
70463dca7d
am 49ed5da3: Merge "Reorder tone mark and nikhahit in DroidSansThai.ttf" into jb-mr1.1-dev
...
* commit '49ed5da31d4f2d7c9f94bdace9f46c8514bcfad7':
Reorder tone mark and nikhahit in DroidSansThai.ttf
2012-12-04 16:31:36 -08:00
John Spurlock
9c902ca473
am 33669f35: Merge "Kill dreams that do not create a timely service connection." into jb-mr1.1-dev
...
* commit '33669f35e4b63bec10bb7202b94340ebd41fbb10':
Kill dreams that do not create a timely service connection.
2012-12-04 16:31:33 -08:00
Amith Yamasani
94022e8997
Make 3rd party lockscreen widgets work on secondary users
...
If you install a lockscreen widget app on a secondary user, lockscreen fails to find it.
There were several places where the correct context and userId were required under the
covers - AppWidgetHost, AppWidgetHostView and RemoteViewsAdapter.
Set the user id in the required places and use it to query the package information.
Bug: 7662835
Change-Id: Ife482c8ab2a2e601650b7cfe2660e88d3b8f2050
2012-12-04 16:25:38 -08:00
Scott Main
cc91d6b7c8
docs: update webview guide with javascript interface info
...
Change-Id: I328d36bf54261ac7d10121424102308159d79f6f
2012-12-04 16:17:18 -08:00
Craig Mautner
83323f427d
Merge "Further decouple layout and animation."
2012-12-04 16:15:31 -08:00
Laurent Tu
e886adbda5
DO NOT MERGE Protect against NPE in FusionEngine.java.
...
Cherry-pick of Ic49a069eef47a62fb1e0c6f284a705a62c6ae232
Bug: 7629406
Change-Id: Ia04dba9496b02755678b43e12834e992f63ee45b
2012-12-04 16:15:24 -08:00
Craig Mautner
9339c401cf
Further decouple layout and animation.
...
Load animation parameters dynamically and synchronously rather than
asynchronously. Eliminates storing parameters and cross-barrier method
calls.
Change-Id: Ia9162f0cb3fe60da35fd9fb5f24f31f88891b950
2012-12-04 16:13:45 -08:00
Victoria Lease
82a76800ad
Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev
2012-12-04 15:59:56 -08:00
Scott Main
3b08bb9d08
am f9861221: docs: delete gps overview page
...
* commit 'f98612213ce70fbb34062db2b5d27d9622d9d3f3':
docs: delete gps overview page
2012-12-04 15:46:03 -08:00