3614394c85
Close InputStream after we're done reading from it
...
External bug #40837
Change-Id: Ic7f3fefb7aabf4d006f9928b6f67d1263f039487
2012-12-03 10:10:22 -08:00
3efa7b597c
Fix requestLayout-during-layout problems
...
An earlier fix to allow requestLayout() to be called during layout
didn't handle some of the requests properly, leaving some nodes
stranded with layout requests that didn't propagate all the way
up the hierarchy. The fix is to do, on the second layout pass, exactly
what we do in a normal layout pass: run measure, then layout.
Issue #7657033 Checkboxes not being updated immediately in Settings
Change-Id: I90be3992d3441e8f43629d26c8386c81a7c31482
2012-12-03 08:41:28 -08:00
eff8dadcbd
am f688ee5d: Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev
...
* commit 'f688ee5dcce1c30a0fd2092722bbbfc99ed9d445':
Change the text color of timer in MediaController
2012-12-03 08:22:01 -08:00
f688ee5dcc
Merge "Change the text color of timer in MediaController" into jb-mr1.1-dev
2012-12-03 08:19:51 -08:00
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
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
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
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
77c67665c8
Merge "resolved conflicts for merge of 8794c80d to master"
2012-11-30 18:44:21 -08:00
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
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
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
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
01a9adde7a
Merge "Adding pool management via the poolable APIs to some classes."
2012-11-30 17:16:54 -08:00
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
1e761ded55
Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
2012-11-30 17:14:11 -08:00
5412ba1cb9
resolved conflicts for merge of 8794c80d to master
...
Change-Id: I61313a3dd4cd0bcbf04c16dc17996a997b43fe0c
2012-11-30 17:08:26 -08:00
53018e520d
Merge "Apply dev. settings at runtime Bug #7434649 "
2012-11-30 17:00:10 -08:00
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
f50ea4e1a3
Merge "Fix broken more JavaDoc links"
2012-11-30 16:44:39 -08:00
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
ce463847db
Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev
2012-11-30 16:37:17 -08:00
47aaba3faf
Fix broken more JavaDoc links
...
Change-Id: Ic1c74c739a668871e37b7b5868f1bc9ed3a65828
2012-11-30 16:32:17 -08:00
5bb3c730f5
Apply dev. settings at runtime
...
Bug #7434649
Change-Id: I16f00eaa8a5eefd9f9849e196cf2cb1659215390
2012-11-30 16:29:33 -08:00
35cc3fb363
Merge "Fix broken JavaDoc"
2012-11-30 16:18:24 -08:00
7c28219cc9
Fix broken JavaDoc
...
Change-Id: I1e6d595f0fcd1a816ed39aaa801f7d451eb39f85
2012-11-30 15:53:28 -08:00
a3b7e450bc
am ca4199ef: am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit 'ca4199ef8b70f73f914b72ec69fc596c2ca600e2':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 15:52:25 -08:00
ca4199ef8b
am 04f3b12f: am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '04f3b12f1f82784d0b1b8c0812a3d0017b17b69e':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 15:44:17 -08:00
04f3b12f1f
am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 15:41:10 -08:00
cb5f9db47a
Fix bug #7651552 resetRtlProperties() is called way too often
...
- remove unnecessary calls to resetRtlProperties().
- now reset of RTL properties will only be done when adding a View
(and no more when removing it)
Change-Id: I0d42128c9f7df6085fb92bb5af5c9bd4d1ba88a3
2012-11-30 15:32:56 -08:00
5ea914f21b
am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
...
* commit '759c1005b3f96ea8bbf59192d206aacece315655':
Fix some typos and missing @param in android.os.Bundle
2012-11-30 14:54:50 -08:00
9f6cb87522
Fix some typos and missing @param in android.os.Bundle
...
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.
Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
2012-11-30 14:41:46 -08:00
f004698fd0
am 57b47ae9: am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '57b47ae95d87c783b39a8d188c059166c04df72b':
Add constant for Daydream settings.
2012-11-30 13:26:18 -08:00
488c2d274b
am d902dbb2: am ed734d98: am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit 'd902dbb2ea7fa3cf50e89d84d1758bac4738e0e1':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:26:06 -08:00
57b47ae95d
am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
Add constant for Daydream settings.
2012-11-30 13:22:03 -08:00
d902dbb2ea
am ed734d98: am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit 'ed734d98d014945cf28aa5e49ba1fd2ff5c82c01':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:21:53 -08:00
9e129f37b6
am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev
...
* commit '924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
Add constant for Daydream settings.
2012-11-30 13:17:22 -08:00
ed734d98d0
am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '0e7adaff99778c596bfd3f4c1e42710592c472a2':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 13:17:08 -08:00
924fc3e6ce
Merge "Add constant for Daydream settings." into jb-mr1.1-dev
2012-11-30 13:03:08 -08:00
0ce57a92d7
Change the text color of timer in MediaController
...
The color of timer and backgroud in MediaController
are too closer to distinguish.
Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com >
Cherrypicked from external contribution.
b/7648349
2012-11-30 12:43:41 -08:00
0e7adaff99
am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
...
* commit '438a3b35f7a6184a19919de90f733be82e21a84c':
Cannot move edit text cursor to first position using character granularity.
2012-11-30 12:40:37 -08:00
438a3b35f7
Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev
2012-11-30 11:43:54 -08:00
701e73d3f6
am 4816f4b4: am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '4816f4b4088ce35b2cddf1034ae483e30b7ed22c':
Secure a handful of framework broadcasts
2012-11-30 10:43:24 -08:00
4816f4b408
am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '0def7b94960ae551c498212d97c7919da7529429':
Secure a handful of framework broadcasts
2012-11-30 10:40:18 -08:00
0def7b9496
am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '849f5188e34ea667b689e795d88411a2412db2e8':
Secure a handful of framework broadcasts
2012-11-30 10:38:21 -08:00
849f5188e3
am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
Secure a handful of framework broadcasts
2012-11-30 10:35:44 -08:00
6643ea823b
resolved conflicts for merge of 011132a7 to jb-mr1-dev
...
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
2012-11-30 10:23:56 -08:00
0c779aa1fb
am 7f05beb1: am 334a36b3: Merge "Change the text color of timer in MediaController"
...
* commit '7f05beb125a0270fee58a96b533baf97536d8b7e':
Change the text color of timer in MediaController
2012-11-30 10:12:47 -08:00
011132a7d3
am b8da0376: Secure a handful of framework broadcasts
...
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
Secure a handful of framework broadcasts
2012-11-30 10:05:33 -08:00
7f05beb125
am 334a36b3: Merge "Change the text color of timer in MediaController"
...
* commit '334a36b32c96d26f3aedcca81ab475391414dc80':
Change the text color of timer in MediaController
2012-11-30 09:55:34 -08:00
