Scott Main
626869434f
am 5eea5490: am 075f554a: am 12de574e: am 80aab876: move Setup link for play services
...
* commit '5eea549009167c0613f2b7dfdf9d2eb1e6efade0':
move Setup link for play services
2012-12-02 16:08:24 -08:00
Scott Main
5eea549009
am 075f554a: am 12de574e: am 80aab876: move Setup link for play services
...
* commit '075f554ae3930f58aff52f525f1d7191b9c7e1ed':
move Setup link for play services
2012-12-02 16:06:21 -08:00
Scott Main
075f554ae3
am 12de574e: am 80aab876: move Setup link for play services
...
* commit '12de574edecd47d83142c8225a8200073123f3b6':
move Setup link for play services
2012-12-02 16:04:16 -08:00
Scott Main
12de574ede
am 80aab876: move Setup link for play services
...
* commit '80aab87653aa6089e89039b74530073202f4c355':
move Setup link for play services
2012-12-02 16:02:14 -08:00
Scott Main
80aab87653
move Setup link for play services
...
Change-Id: I436abf4929e2d69c5f9fadca0f79321d069618ea
2012-11-30 20:28:58 -08:00
Scott Main
decf660780
am b294e7f1: am a99ee74c: am 76277df2: am 5f7b668c: misc changes for landing pages
...
* commit 'b294e7f17f431b162237b408ef3dc76ddb6b7a94':
misc changes for landing pages
2012-11-30 20:17:49 -08:00
Scott Main
b294e7f17f
am a99ee74c: am 76277df2: am 5f7b668c: misc changes for landing pages
...
* commit 'a99ee74c0d6e6c8520d8fd02deab7a80f2a89174':
misc changes for landing pages
2012-11-30 20:15:44 -08:00
Scott Main
a99ee74c0d
am 76277df2: am 5f7b668c: misc changes for landing pages
...
* commit '76277df27c4d4df39321c400bd5adece32a59b58':
misc changes for landing pages
2012-11-30 20:13:15 -08:00
Scott Main
76277df27c
am 5f7b668c: misc changes for landing pages
...
* commit '5f7b668c966a886d5893ff89af59785fab9523f9':
misc changes for landing pages
2012-11-30 20:11:04 -08:00
Scott Main
5f7b668c96
misc changes for landing pages
...
Change-Id: I4eff32dccbb111b419bb733035c7a145ac3944b6
2012-11-30 19:32:21 -08:00
Amith Yamasani
c72beac860
am 0f469f4f: am 32df98d5: am c566b43d: Fix crosstalk between users for widgets hosted in lockscreen
...
* commit '0f469f4f7eff8faee4350a0d82af325d4ae10b43':
Fix crosstalk between users for widgets hosted in lockscreen
2012-11-30 19:10:36 -08:00
Fabrice Di Meglio
b1e76ebaab
am 2e8dd459: am 4e1b2f44: am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
...
* commit '2e8dd459fb111a8e38b01af4abbebe3b8acb497b':
Fix typos in LinearLayout comments
2012-11-30 18:47:09 -08:00
Scott Main
5414bec1d0
am 86174e15: am 15ac2cfb: am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
...
* commit '86174e15141f17e77dedb604517329f12fd1e49a':
docs: gcm navtree
2012-11-30 18:47:05 -08:00
Quddus Chong
cff89f0103
am 42c0dfbb: am f8b74a32: am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
...
* commit '42c0dfbb359a9d331a37fc0e91e5f8883a65ac85':
docs: Fixed typo in android tool syntax.
2012-11-30 18:47:02 -08:00
Craig Mautner
52a839de9e
am 3351ab27: am f967500e: am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev
...
* commit '3351ab27b9fc9eb2b21044ac68efebd1cfe85dfb':
Include child windows when looking for insertion point.
2012-11-30 18:46:58 -08:00
Amith Yamasani
0f469f4f7e
am 32df98d5: am c566b43d: Fix crosstalk between users for widgets hosted in lockscreen
...
* commit '32df98d52d482498d998b424684610c15098897a':
Fix crosstalk between users for widgets hosted in lockscreen
2012-11-30 18:46:45 -08:00
Amith Yamasani
32df98d52d
am c566b43d: Fix crosstalk between users for widgets hosted in lockscreen
...
* commit 'c566b43d02596cba437e9a2723e9f989297cca72':
Fix crosstalk between users for widgets hosted in lockscreen
2012-11-30 18:44:36 -08:00
Fabrice Di Meglio
77c67665c8
Merge "resolved conflicts for merge of 8794c80d to master"
2012-11-30 18:44:21 -08:00
Amith Yamasani
c566b43d02
Fix crosstalk between users for widgets hosted in lockscreen
...
This was initially about the Clock widget crashing repeatedly on some
devices with multiple users. Turned out that there were race conditions
when switching users that could result in remote views of one user calling
back to the RemoteViewsAdapter in keyguard that in turn sent an incorrect widget id
to a different user's widget, resulting in a crash.
Since KeyguardHostView is instantiated in the same process for different users,
it needs to carry a user identity to pass along to AppWidgetService so that
remote views services were bound to the correct user and callbacks were attached and
detached properly.
Added some aidl calls that take the userId to do the binding properly. A more
complete fix might be needed in the future so that all calls from Keyguard carry
the user id.
Also, there was a problem in comparing host uid for secondary users, since Settings
for a secondary user has a different uid than keyguard. Not an issue on single-user
systems. Changed the host.uid comparison to accomodate for the secondary user.
Bug: 7450247
Change-Id: Idbc36e3c60023cac74174f6cb7f2b2130dd3052c
2012-11-30 17:28:08 -08:00
Fabrice Di Meglio
2e8dd459fb
am 4e1b2f44: am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
...
* commit '4e1b2f44e9f43b123e00eb210c9fa4ec78710782':
Fix typos in LinearLayout comments
2012-11-30 17:20:44 -08:00
Fabrice Di Meglio
4e1b2f44e9
am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
...
* commit '20b76b9fff076241fe305fc99be3be7ab7d10407':
Fix typos in LinearLayout comments
2012-11-30 17:18:49 -08:00
Fabrice Di Meglio
20b76b9fff
am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
...
* commit '1e761ded55695a9d76a6f00ee9504625581e8d3a':
Fix typos in LinearLayout comments
2012-11-30 17:17:03 -08:00
Svetoslav Ganov
01a9adde7a
Merge "Adding pool management via the poolable APIs to some classes."
2012-11-30 17:16:54 -08:00
Svetoslav Ganov
be922dc976
Adding pool management via the poolable APIs to some classes.
...
1. Removed the support for infinite pool size which nobody was using and
does not make sense.
2. Update some classes in ViewGroup to use the poolable APIs.
Change-Id: Ifdb8c10968cd06fe53085ec9d3d649f7c9a944b7
2012-11-30 17:16:17 -08:00
Fabrice Di Meglio
1e761ded55
Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
2012-11-30 17:14:11 -08:00
Scott Main
86174e1514
am 15ac2cfb: am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
...
* commit '15ac2cfb65601e00e9489545db4b9a39919d297f':
docs: gcm navtree
2012-11-30 17:10:51 -08:00
Scott Main
15ac2cfb65
am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
...
* commit 'ed3d92aea49422c0e5ec117a04fe573ea141962a':
docs: gcm navtree
2012-11-30 17:08:59 -08:00
Fabrice Di Meglio
5412ba1cb9
resolved conflicts for merge of 8794c80d to master
...
Change-Id: I61313a3dd4cd0bcbf04c16dc17996a997b43fe0c
2012-11-30 17:08:26 -08:00
Scott Main
ed3d92aea4
am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
...
* commit '404eeee14521e8b181a9ed28c2291e9389dcf3b1':
docs: gcm navtree
2012-11-30 17:07:11 -08:00
Scott Main
404eeee145
Merge "docs: gcm navtree" into jb-mr1-dev
2012-11-30 17:04:31 -08:00
Robert Ly
2123523290
docs: gcm navtree
...
Change-Id: Ie20a0cc7caf8e0b5ff2a6f56ddc3932f25768fa3
2012-11-30 17:02:22 -08:00
Romain Guy
53018e520d
Merge "Apply dev. settings at runtime Bug #7434649 "
2012-11-30 17:00:10 -08:00
Quddus Chong
42c0dfbb35
am f8b74a32: am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
...
* commit 'f8b74a32dfd7b20b71e06e1516cc5119cfffb2b5':
docs: Fixed typo in android tool syntax.
2012-11-30 16:46:10 -08:00
Craig Mautner
3351ab27b9
am f967500e: am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev
...
* commit 'f967500ebaefb95d7a1c14acd05574a0f17ec078':
Include child windows when looking for insertion point.
2012-11-30 16:46:03 -08:00
Fabrice Di Meglio
8794c80dd7
am a9854ce9: am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
...
* commit 'a9854ce9dfac086533e9d49ac75076bcc579303b':
Fix bug #7651552 resetRtlProperties() is called way too often
2012-11-30 16:46:00 -08:00
Robert Ly
b2de7c6d7e
am d6803668: am 69780253: am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
...
* commit 'd6803668304ef1d8aecdcd1ff9e79e25d89f9db5':
docs: update javadocs with gcm @value stuff
2012-11-30 16:45:43 -08:00
Jonathan Dixon
f50ea4e1a3
Merge "Fix broken more JavaDoc links"
2012-11-30 16:44:39 -08:00
Quddus Chong
f8b74a32df
am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
...
* commit '3a195029066fab3bae5797003314e3fa5bbf7e29':
docs: Fixed typo in android tool syntax.
2012-11-30 16:44:29 -08:00
Robert Ly
d680366830
am 69780253: am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
...
* commit '697802538fda082de697a287473e1592912c0e78':
docs: update javadocs with gcm @value stuff
2012-11-30 16:44:20 -08:00
Craig Mautner
f967500eba
am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev
...
* commit '46732445b4c02c225544851cb6cf848ec0583494':
Include child windows when looking for insertion point.
2012-11-30 16:42:56 -08:00
Quddus Chong
3a19502906
am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
...
* commit '51f5bcac5269b44cd312d16569357416da7b3a82':
docs: Fixed typo in android tool syntax.
2012-11-30 16:41:49 -08:00
Fabrice Di Meglio
a9854ce9df
am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
...
* commit 'ce463847db68afbb796377c6a55209e102774f8c':
Fix bug #7651552 resetRtlProperties() is called way too often
2012-11-30 16:41:12 -08:00
Quddus Chong
51f5bcac52
Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
2012-11-30 16:39:29 -08:00
Craig Mautner
46732445b4
Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev
2012-11-30 16:38:37 -08:00
Robert Ly
697802538f
am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
...
* commit '27dcf445eb66ea032992ff30b3cd36770e1ab929':
docs: update javadocs with gcm @value stuff
2012-11-30 16:38:12 -08:00
Fabrice Di Meglio
ce463847db
Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
2012-11-30 16:37:17 -08:00
Robert Ly
27dcf445eb
am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
...
* commit '037b7944bdd5909c503cdc959b0105ebb0ecca92':
docs: update javadocs with gcm @value stuff
2012-11-30 16:36:05 -08:00
Robert Ly
037b7944bd
Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
2012-11-30 16:33:51 -08:00
Jonathan Dixon
47aaba3faf
Fix broken more JavaDoc links
...
Change-Id: Ic1c74c739a668871e37b7b5868f1bc9ed3a65828
2012-11-30 16:32:17 -08:00
Romain Guy
5bb3c730f5
Apply dev. settings at runtime
...
Bug #7434649
Change-Id: I16f00eaa8a5eefd9f9849e196cf2cb1659215390
2012-11-30 16:29:33 -08:00