OSDN Git Service
Robert Greenwalt [Mon, 15 Oct 2012 18:38:41 +0000 (11:38 -0700)]
am
4e579b5a: am
a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev
* commit '
4e579b5ac23fc2eda314fb43600c83ebc3eb2cd0':
Monitor the right interface re VPN
Robert Greenwalt [Mon, 15 Oct 2012 18:37:13 +0000 (11:37 -0700)]
am
a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev
* commit '
a30d969401a8533a5a341664421ba9b1e150bac3':
Monitor the right interface re VPN
Robert Greenwalt [Mon, 15 Oct 2012 18:34:02 +0000 (11:34 -0700)]
Merge "Monitor the right interface re VPN" into jb-mr1-dev
Irfan Sheriff [Mon, 15 Oct 2012 17:27:54 +0000 (10:27 -0700)]
am
7e08477e: am
d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev
* commit '
7e08477ed1589bc7d6488c8bacbdfb407fda20f0':
Fix handling of lost device
Irfan Sheriff [Mon, 15 Oct 2012 17:25:23 +0000 (10:25 -0700)]
am
d86a532c: Merge "Fix handling of lost device" into jb-mr1-dev
* commit '
d86a532c5271dfbfe7378ddeb6700fafd92ecbcc':
Fix handling of lost device
Irfan Sheriff [Mon, 15 Oct 2012 17:23:22 +0000 (10:23 -0700)]
Merge "Fix handling of lost device" into jb-mr1-dev
Marco Nelissen [Mon, 15 Oct 2012 17:04:54 +0000 (10:04 -0700)]
am
6133e92e: am
48df1491: Merge "Rewind buffer before copying into it." into jb-mr1-dev
* commit '
6133e92e6bd6557f5b1324e515b35fd8e6a9cd54':
Rewind buffer before copying into it.
Marco Nelissen [Mon, 15 Oct 2012 17:02:59 +0000 (10:02 -0700)]
am
48df1491: Merge "Rewind buffer before copying into it." into jb-mr1-dev
* commit '
48df14919602a7aac9ea9d0f0a2a3afe04eb6e0b':
Rewind buffer before copying into it.
Marco Nelissen [Mon, 15 Oct 2012 17:00:15 +0000 (10:00 -0700)]
Merge "Rewind buffer before copying into it." into jb-mr1-dev
Chris Wren [Mon, 15 Oct 2012 16:10:21 +0000 (09:10 -0700)]
am
5d0a560c: am
4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
* commit '
5d0a560ca4e455bfe8f77c2872a479e210b38dcf':
delay onDreamingStarted() to work around asynchrony.
Chris Wren [Mon, 15 Oct 2012 16:08:17 +0000 (09:08 -0700)]
am
4a01f2b5: Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
* commit '
4a01f2b5dcb5bcb72358905db402731013195cfd':
delay onDreamingStarted() to work around asynchrony.
Chris Wren [Mon, 15 Oct 2012 16:06:36 +0000 (09:06 -0700)]
Merge "delay onDreamingStarted() to work around asynchrony." into jb-mr1-dev
The Android Open Source Project [Mon, 15 Oct 2012 14:38:41 +0000 (07:38 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I8cfdea0a54b2a687eff159f9e5cd7706ccdb290e
The Android Automerger [Mon, 15 Oct 2012 13:59:20 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jim Miller [Mon, 15 Oct 2012 09:32:48 +0000 (02:32 -0700)]
am
1deaf3c7: am
87d57952: Minor layout tweaks and bug fix in keyguard
* commit '
1deaf3c710c54a23ace35e1f5c1718591133b681':
Minor layout tweaks and bug fix in keyguard
Jim Miller [Mon, 15 Oct 2012 09:31:04 +0000 (02:31 -0700)]
am
87d57952: Minor layout tweaks and bug fix in keyguard
* commit '
87d57952af662a94637c1519b2189e22456af2db':
Minor layout tweaks and bug fix in keyguard
Jim Miller [Mon, 15 Oct 2012 09:10:57 +0000 (02:10 -0700)]
Minor layout tweaks and bug fix in keyguard
- fix wrong string in SIM PUK unlock
- use buttonBar style for "emergency" and "forgot pattern" buttons
Bug
7341237
Change-Id: Id5593b54c345e3f869b6febc8554da01e7cb319e
Jim Miller [Mon, 15 Oct 2012 08:02:39 +0000 (01:02 -0700)]
am
63b977de: am
14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue
7341237):" into jb-mr1-dev
* commit '
63b977de7e7cba17ba8abd78f7750d4bc56c8c45':
Fixing issues with pattern recovery / account view (issue
7341237):
Jim Miller [Mon, 15 Oct 2012 07:59:54 +0000 (00:59 -0700)]
am
14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue
7341237):" into jb-mr1-dev
* commit '
14bb25a3864d38da8f2b73180db649039558a37b':
Fixing issues with pattern recovery / account view (issue
7341237):
Jim Miller [Mon, 15 Oct 2012 07:57:48 +0000 (00:57 -0700)]
Merge "Fixing issues with pattern recovery / account view (issue
7341237):" into jb-mr1-dev
Irfan Sheriff [Mon, 15 Oct 2012 06:03:20 +0000 (23:03 -0700)]
am
2afe0611: am
e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev
* commit '
2afe06114c3eaa6aef0a442275392d44a43b64f5':
Cleanup on async disconnect and finalize
Irfan Sheriff [Mon, 15 Oct 2012 06:01:09 +0000 (23:01 -0700)]
am
e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev
* commit '
e6e810048ea85e48ec74f6a9e0b18f5dd3d475e1':
Cleanup on async disconnect and finalize
Irfan Sheriff [Mon, 15 Oct 2012 05:58:48 +0000 (22:58 -0700)]
Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev
Irfan Sheriff [Fri, 12 Oct 2012 22:52:13 +0000 (15:52 -0700)]
Fix handling of lost device
We did not update a lost device notice to apps properly. This causes incorrect
connection initiation without a discovery which leads to failed invitation
requests to supplicant.
Bug:
7328758
Change-Id: If4b594c737d639d0f553188309319fba4e3ee7b7
Adam Cohen [Mon, 15 Oct 2012 04:25:08 +0000 (21:25 -0700)]
Fixing issues with pattern recovery / account view (issue
7341237):
-> Recovery button should only appear if account present
-> Recovery button should appear at bottom
-> Account view should have emergency call button
-> Account view should not show the clock / status area
Change-Id: Id12e8219f3fc6ecb14e82c5ec6ea4b3e28ed772d
Adam Cohen [Mon, 15 Oct 2012 00:45:05 +0000 (17:45 -0700)]
am
18e9575c: am
6dbf8610: Fix for NPE with pattern recovery (issue
7341237)
* commit '
18e9575cad3bfc5c764396a359f9c2f5193e96a9':
Fix for NPE with pattern recovery (issue
7341237)
Adam Cohen [Mon, 15 Oct 2012 00:43:28 +0000 (17:43 -0700)]
am
6dbf8610: Fix for NPE with pattern recovery (issue
7341237)
* commit '
6dbf8610e94c1b41e0124577101d6369fd204ad3':
Fix for NPE with pattern recovery (issue
7341237)
Adam Cohen [Mon, 15 Oct 2012 00:26:31 +0000 (17:26 -0700)]
Fix for NPE with pattern recovery (issue
7341237)
-> Dealt with this NPE, and guarded against all related NPEs (which probably
can't happen, but given the stakes of a system crash, this is safer).
Change-Id: I3c207839ae0279033b6f3dad791d710b19415439
Jim Miller [Sun, 14 Oct 2012 19:13:32 +0000 (12:13 -0700)]
am
1ea95455: am
66e93076: Merge "Disable security view transitions in keyguard" into jb-mr1-dev
* commit '
1ea9545586d851999e68e823e1d4e5d5e76ee98f':
Disable security view transitions in keyguard
Jim Miller [Sun, 14 Oct 2012 19:11:37 +0000 (12:11 -0700)]
am
66e93076: Merge "Disable security view transitions in keyguard" into jb-mr1-dev
* commit '
66e9307645449c50a5a53140cc408c114f5b78fe':
Disable security view transitions in keyguard
Jim Miller [Sun, 14 Oct 2012 19:08:44 +0000 (12:08 -0700)]
Merge "Disable security view transitions in keyguard" into jb-mr1-dev
Craig Mautner [Sun, 14 Oct 2012 18:29:43 +0000 (11:29 -0700)]
am
f93afcde: am
27c0773c: Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev
* commit '
f93afcde559ac370fcff384527a85e762a26673a':
Fix wallpaper not updating on initial boot.
Craig Mautner [Sun, 14 Oct 2012 18:27:40 +0000 (11:27 -0700)]
am
27c0773c: Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev
* commit '
27c0773c34001c02cb7e2a6ae6e085ee3ed150cf':
Fix wallpaper not updating on initial boot.
Craig Mautner [Sun, 14 Oct 2012 18:25:22 +0000 (11:25 -0700)]
Merge "Fix wallpaper not updating on initial boot." into jb-mr1-dev
The Android Automerger [Sun, 14 Oct 2012 13:59:18 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jim Miller [Sun, 14 Oct 2012 12:04:00 +0000 (05:04 -0700)]
Disable security view transitions in keyguard
Now that we have a single stage unlock, there's no need for the transition. This
was causing unnecessary flickering to happen in views where we add the security view
just after inflation, which triggers the animation.
Fixes bug
7343632
Change-Id: I5bb8e37df66e4d96f00719e318424d46bf0e2e5a
Adam Cohen [Sun, 14 Oct 2012 03:44:57 +0000 (20:44 -0700)]
am
002ab676: am
3b9f9bce: Merge "Fix inability to start pattern outside view bounds (issue
7344325)" into jb-mr1-dev
* commit '
002ab676ef8287e0135c3deb4a5fe0175b68d460':
Fix inability to start pattern outside view bounds (issue
7344325)
Adam Cohen [Sun, 14 Oct 2012 03:43:18 +0000 (20:43 -0700)]
am
3b9f9bce: Merge "Fix inability to start pattern outside view bounds (issue
7344325)" into jb-mr1-dev
* commit '
3b9f9bceeaff0fe23f68f24d604158f614053dcf':
Fix inability to start pattern outside view bounds (issue
7344325)
Adam Cohen [Sun, 14 Oct 2012 03:40:33 +0000 (20:40 -0700)]
Merge "Fix inability to start pattern outside view bounds (issue
7344325)" into jb-mr1-dev
Adam Cohen [Sun, 14 Oct 2012 03:24:26 +0000 (20:24 -0700)]
Fix inability to start pattern outside view bounds (issue
7344325)
-> At the same time, disabling the abilit to page the widget region
and see the overscroll effect
Change-Id: Icd9d9e253404bfbfc411d8958f7c634ca4e37279
Adam Cohen [Sun, 14 Oct 2012 02:39:04 +0000 (19:39 -0700)]
am
48b3e306: am
c4c56222: Merge "Fix blank clock (issue
7344512)" into jb-mr1-dev
* commit '
48b3e3063b323952f25920856a20483a062a1437':
Fix blank clock (issue
7344512)
Adam Cohen [Sun, 14 Oct 2012 02:36:58 +0000 (19:36 -0700)]
am
c4c56222: Merge "Fix blank clock (issue
7344512)" into jb-mr1-dev
* commit '
c4c562223b0246d2cbb973d0b0ab63f860798475':
Fix blank clock (issue
7344512)
Adam Cohen [Sun, 14 Oct 2012 02:34:44 +0000 (19:34 -0700)]
Merge "Fix blank clock (issue
7344512)" into jb-mr1-dev
Adam Cohen [Sun, 14 Oct 2012 02:28:42 +0000 (19:28 -0700)]
am
2e71e3f1: am
33387b1b: Merge "Fix edge case with status message (issue
7343848)" into jb-mr1-dev
* commit '
2e71e3f167ea1bc1016e562f66619843a0743b5e':
Fix edge case with status message (issue
7343848)
Adam Cohen [Sun, 14 Oct 2012 02:26:45 +0000 (19:26 -0700)]
am
33387b1b: Merge "Fix edge case with status message (issue
7343848)" into jb-mr1-dev
* commit '
33387b1bee6813ea2f5cf82c7244dc90453a7c2c':
Fix edge case with status message (issue
7343848)
Adam Cohen [Sun, 14 Oct 2012 02:23:48 +0000 (19:23 -0700)]
Merge "Fix edge case with status message (issue
7343848)" into jb-mr1-dev
Adam Cohen [Sun, 14 Oct 2012 02:10:56 +0000 (19:10 -0700)]
Fix blank clock (issue
7344512)
Change-Id: Iad23f049fcc31ad8f08c99e7c3088e1523de1d45
Craig Mautner [Sat, 13 Oct 2012 22:40:28 +0000 (15:40 -0700)]
Fix wallpaper not updating on initial boot.
Update the wallpaper and redraw it unconditionally when the surface
changes. Previously we were not updating the wallpaper when the
surface changed which meant that it remained at the original surface
dimensions. Also, the indication that it was visible comes in too
late to display it cleanly without jank.
Bug:
7310334 fixed.
Change-Id: Ic2ae95ea0b0704183053da1d7a906818651c62c9
Adam Cohen [Sun, 14 Oct 2012 00:03:16 +0000 (17:03 -0700)]
Fix edge case with status message (issue
7343848)
-> When an unimportant message is set, we need to clear the security string
so that battery / owner info takes precedence at that point.
Change-Id: I3f86b0c2cc8fb2fb0023fce77a7725d8ada96d9e
Adam Cohen [Sat, 13 Oct 2012 23:43:10 +0000 (16:43 -0700)]
am
30621122: am
32f9e8ff: Merge "Only showing important security messages in status area (issue
7341795)" into jb-mr1-dev
* commit '
30621122e57efa8717de58a35ccc21f62fb6637d':
Only showing important security messages in status area (issue
7341795)
Adam Cohen [Sat, 13 Oct 2012 23:41:21 +0000 (16:41 -0700)]
am
32f9e8ff: Merge "Only showing important security messages in status area (issue
7341795)" into jb-mr1-dev
* commit '
32f9e8ffdd552aef550cd21c97d792b421cb12f9':
Only showing important security messages in status area (issue
7341795)
Adam Cohen [Sat, 13 Oct 2012 23:38:48 +0000 (16:38 -0700)]
Merge "Only showing important security messages in status area (issue
7341795)" into jb-mr1-dev
Adam Cohen [Sat, 13 Oct 2012 02:57:16 +0000 (19:57 -0700)]
Only showing important security messages in status area (issue
7341795)
Change-Id: Ie2fcd4dd7130b4684223d0442f50e76435f61768
The Android Automerger [Sat, 13 Oct 2012 22:37:08 +0000 (15:37 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Daniel Sandler [Sat, 13 Oct 2012 22:13:56 +0000 (15:13 -0700)]
am
7fcc9b17: am
e111ad30: No, that\'s German for "The Quick Settings, The".
* commit '
7fcc9b17811ae9ece8a27831f1891a935257b1e5':
No, that's German for "The Quick Settings, The".
Daniel Sandler [Sat, 13 Oct 2012 22:11:01 +0000 (15:11 -0700)]
am
e111ad30: No, that\'s German for "The Quick Settings, The".
* commit '
e111ad300d614a0f94e30f96ae664a1de578c48a':
No, that's German for "The Quick Settings, The".
Daniel Sandler [Sat, 13 Oct 2012 19:17:45 +0000 (15:17 -0400)]
No, that's German for "The Quick Settings, The".
Bug: ???????
Change-Id: I24ffb21b1566d98c9df6db48c4062390757cd8bc
The Android Automerger [Sat, 13 Oct 2012 10:50:08 +0000 (03:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Adam Powell [Sat, 13 Oct 2012 08:47:53 +0000 (01:47 -0700)]
am
13b82d66: am
85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
* commit '
13b82d668db5013ff9aa6a2e471a821d31799bfe':
Fix keyguard dimensions; IME state for password view; layouts
Adam Powell [Sat, 13 Oct 2012 08:46:14 +0000 (01:46 -0700)]
am
85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
* commit '
85341a76677abcccee757f7982b48b3bec2dcf63':
Fix keyguard dimensions; IME state for password view; layouts
Adam Powell [Sat, 13 Oct 2012 08:44:13 +0000 (01:44 -0700)]
Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
Adam Powell [Sat, 13 Oct 2012 05:02:27 +0000 (22:02 -0700)]
Fix keyguard dimensions; IME state for password view; layouts
Fix a bug where ordering during inflation caused us not to set a
keyguard callback early enough to properly modify window flags. Add a
gross hack to work around this for now.
Fix status layouts to scale a bit more gracefully in the presence of
an IME.
Fix password layouts to scale more gracefully in the presence of an
IME
Bug
7343312
Bug
7341795
Bug
7342963
Bug
7343089
Change-Id: Ifb2c06defef11e8f7f9d0e09855632ed491bb31c
Jim Miller [Sat, 13 Oct 2012 08:20:01 +0000 (01:20 -0700)]
am
14c64ab2: am
211a18e2: Merge "Partial fix for blank widget page" into jb-mr1-dev
* commit '
14c64ab214864466dc440d55f3646146119df355':
Partial fix for blank widget page
Jim Miller [Sat, 13 Oct 2012 08:18:03 +0000 (01:18 -0700)]
am
211a18e2: Merge "Partial fix for blank widget page" into jb-mr1-dev
* commit '
211a18e2d6548ffc4657b8199661a1764f1008e0':
Partial fix for blank widget page
Jim Miller [Sat, 13 Oct 2012 08:16:31 +0000 (01:16 -0700)]
Merge "Partial fix for blank widget page" into jb-mr1-dev
Jim Miller [Sat, 13 Oct 2012 07:32:43 +0000 (00:32 -0700)]
am
b42bf694: am
28dc64b8: Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev
* commit '
b42bf6941156f49fd240607b9ed4163113e9a825':
Disable loading widgets in single-stage keyguard
Jim Miller [Sat, 13 Oct 2012 07:30:47 +0000 (00:30 -0700)]
am
28dc64b8: Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev
* commit '
28dc64b86b6648d8b38eb202531e20560e1298bc':
Disable loading widgets in single-stage keyguard
Jim Miller [Sat, 13 Oct 2012 07:29:15 +0000 (00:29 -0700)]
Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev
Kenny Root [Sat, 13 Oct 2012 06:57:38 +0000 (23:57 -0700)]
am
82634313: Merge "Reject bad ResXMLTree::setTo calls"
* commit '
826343138dfd8666d2263dd82bfdbf657fc1881e':
Reject bad ResXMLTree::setTo calls
Kenny Root [Sat, 13 Oct 2012 06:46:14 +0000 (23:46 -0700)]
Merge "Reject bad ResXMLTree::setTo calls"
Adam Powell [Sat, 13 Oct 2012 03:01:45 +0000 (20:01 -0700)]
am
eda02c7e: am
308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
* commit '
eda02c7e3204a5e6dfdac8fb84c61a112fdc6823':
Fix offsets for glowpad on keyguard
Adam Powell [Sat, 13 Oct 2012 02:59:28 +0000 (19:59 -0700)]
am
308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
* commit '
308b1a66b2d109feb509998bd50557ac7e6c90f4':
Fix offsets for glowpad on keyguard
Adam Powell [Sat, 13 Oct 2012 02:57:06 +0000 (19:57 -0700)]
Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev
Adam Powell [Sat, 13 Oct 2012 02:20:10 +0000 (19:20 -0700)]
Fix offsets for glowpad on keyguard
Bug
7342491
Change-Id: Id9733070c28a85c47ac8b982768e47a4254bd825
Jason Sams [Sat, 13 Oct 2012 02:10:05 +0000 (19:10 -0700)]
am
08dd6d1f: am
56754193: Merge "Fix cycle detection for SGs." into jb-mr1-dev
* commit '
08dd6d1f0e92a93b499dd4d63ef0f23c728adc97':
Fix cycle detection for SGs.
Jason Sams [Sat, 13 Oct 2012 02:07:12 +0000 (19:07 -0700)]
am
56754193: Merge "Fix cycle detection for SGs." into jb-mr1-dev
* commit '
5675419356793a546e58482a51e245ee34500758':
Fix cycle detection for SGs.
Jason Sams [Sat, 13 Oct 2012 02:07:12 +0000 (19:07 -0700)]
am
d473f83a: am
10542ec3: Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev
* commit '
d473f83a3e6591842d66a3d35d916843a9ad25a5':
Port ImageProcessing to Filterscript.
Jason Sams [Sat, 13 Oct 2012 02:05:21 +0000 (19:05 -0700)]
am
7f2083fe: am
73db36e6: Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev
* commit '
7f2083fe481f7e31d36f9ea96f945273dbd58526':
Fix crash in ImageProcessing blend test
Jason Sams [Sat, 13 Oct 2012 02:04:26 +0000 (19:04 -0700)]
am
10542ec3: Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev
* commit '
10542ec336f006b5ff311ab53f43750ea9d84838':
Port ImageProcessing to Filterscript.
Victoria Lease [Sat, 13 Oct 2012 02:03:35 +0000 (19:03 -0700)]
am
04bb190c: am
f402fa46: Merge "Simplify fused location provider." into jb-mr1-dev
* commit '
04bb190c541a2cecd9bdf33ec35474a2e9f8f95d':
Simplify fused location provider.
Jason Sams [Sat, 13 Oct 2012 02:02:55 +0000 (19:02 -0700)]
Merge "Fix cycle detection for SGs." into jb-mr1-dev
Jason Sams [Sat, 13 Oct 2012 02:02:43 +0000 (19:02 -0700)]
am
73db36e6: Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev
* commit '
73db36e6d8e4ad89c710783b66b99064e483b614':
Fix crash in ImageProcessing blend test
Jason Sams [Sat, 13 Oct 2012 02:01:37 +0000 (19:01 -0700)]
Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev
Victoria Lease [Sat, 13 Oct 2012 02:01:07 +0000 (19:01 -0700)]
am
f402fa46: Merge "Simplify fused location provider." into jb-mr1-dev
* commit '
f402fa46257f4ef61ce1e91901dfb44ff5f7f87c':
Simplify fused location provider.
Jason Sams [Sat, 13 Oct 2012 02:00:19 +0000 (19:00 -0700)]
Merge "Fix crash in ImageProcessing blend test" into jb-mr1-dev
Victoria Lease [Sat, 13 Oct 2012 01:58:36 +0000 (18:58 -0700)]
Merge "Simplify fused location provider." into jb-mr1-dev
Fabrice Di Meglio [Sat, 13 Oct 2012 01:29:59 +0000 (18:29 -0700)]
am
b65b5133: am
f9307c5c: Merge "Fix bug #
7334966 Padding is still broken in RTL languages" into jb-mr1-dev
* commit '
b65b5133e7590e68053bbf4530b31b7206c7b984':
Fix bug #
7334966 Padding is still broken in RTL languages
Fabrice Di Meglio [Sat, 13 Oct 2012 01:28:33 +0000 (18:28 -0700)]
am
f9307c5c: Merge "Fix bug #
7334966 Padding is still broken in RTL languages" into jb-mr1-dev
* commit '
f9307c5c00bd3e8338bd478fec67a0190d515558':
Fix bug #
7334966 Padding is still broken in RTL languages
Fabrice Di Meglio [Sat, 13 Oct 2012 01:25:44 +0000 (18:25 -0700)]
Merge "Fix bug #
7334966 Padding is still broken in RTL languages" into jb-mr1-dev
Jim Miller [Fri, 12 Oct 2012 21:45:34 +0000 (14:45 -0700)]
Disable loading widgets in single-stage keyguard
Change-Id: I8975c3a8e6ba060987fda2d0d4b9fc8dc0686d06
Dianne Hackborn [Sat, 13 Oct 2012 00:48:12 +0000 (17:48 -0700)]
am
48f6b7e2: am
59cb2cf1: Merge "Revert fix to issue #
6880627: PendingIntent.getService() returns..." into jb-mr1-dev
* commit '
48f6b7e228f4b18181756b7c97df094b86a550aa':
Revert fix to issue #
6880627: PendingIntent.getService() returns...
Dianne Hackborn [Sat, 13 Oct 2012 00:46:39 +0000 (17:46 -0700)]
am
59cb2cf1: Merge "Revert fix to issue #
6880627: PendingIntent.getService() returns..." into jb-mr1-dev
* commit '
59cb2cf15c912280b32292c79c2c0e5bfea49b68':
Revert fix to issue #
6880627: PendingIntent.getService() returns...
Dianne Hackborn [Sat, 13 Oct 2012 00:43:45 +0000 (17:43 -0700)]
Merge "Revert fix to issue #
6880627: PendingIntent.getService() returns..." into jb-mr1-dev
Robert Greenwalt [Sat, 13 Oct 2012 00:02:45 +0000 (17:02 -0700)]
Monitor the right interface re VPN
Must remember the outer interface - undoes a change from a
couple months ago that broke things.
bug:
7336302
Change-Id: Ia4f60862c60f3078853e151980e09cbf22a57222
Michael Jurka [Fri, 12 Oct 2012 23:45:58 +0000 (16:45 -0700)]
am
3b61f479: am
f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev
* commit '
3b61f479cdc6efc0a181103f14e59ec520f08713':
Use black bg in recents if using live wallpaper
Michael Jurka [Fri, 12 Oct 2012 23:43:42 +0000 (16:43 -0700)]
am
f15005ee: Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev
* commit '
f15005ee3926302588d19f1be6ad4a62b3e691b4':
Use black bg in recents if using live wallpaper
Michael Jurka [Fri, 12 Oct 2012 23:41:47 +0000 (16:41 -0700)]
Merge "Use black bg in recents if using live wallpaper" into jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:34:33 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Guang Zhu [Fri, 12 Oct 2012 23:33:57 +0000 (16:33 -0700)]
am
d3036f7e: am
d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev
* commit '
d3036f7e89747d7347eb8b94c5517162cc71b5af':
use BufferedInputStream in readTextFile
Guang Zhu [Fri, 12 Oct 2012 23:32:47 +0000 (16:32 -0700)]
am
d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev
* commit '
d4805af6163b6873abbf628f6672a2188e24ef3c':
use BufferedInputStream in readTextFile
OSDN Git Service
