OSDN Git Service
John Spurlock [Fri, 26 Sep 2014 20:07:42 +0000 (20:07 +0000)]
am
f60d0032: Merge "Touch-exploration improvements to volume dialog." into lmp-dev
* commit '
f60d00328c2bd3b34aaaaadf157621e874d6c664':
Touch-exploration improvements to volume dialog.
Kevin Ma [Fri, 26 Sep 2014 20:00:16 +0000 (20:00 +0000)]
am
666f2a91: am
938ff081: (-s ours) am
18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
* commit '
666f2a918e9cca6f0e219d0abb7ac250953f9f24':
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
John Spurlock [Fri, 26 Sep 2014 19:58:44 +0000 (19:58 +0000)]
Merge "Touch-exploration improvements to volume dialog." into lmp-dev
Kevin Ma [Fri, 26 Sep 2014 19:52:06 +0000 (19:52 +0000)]
am
938ff081: (-s ours) am
18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
* commit '
938ff081a61d31e5eefca7cee582002aea1c06ff':
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
Kevin Ma [Fri, 26 Sep 2014 19:43:39 +0000 (19:43 +0000)]
am
18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
* commit '
18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
Dave Burke [Fri, 26 Sep 2014 19:43:19 +0000 (19:43 +0000)]
am
e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
* commit '
e09e20eeca4b822855e02507a4e30387ea4ee1a6':
Revert "Fix memory leak where we close the descriptor instead of the file."
Dan Sandler [Fri, 26 Sep 2014 19:43:16 +0000 (19:43 +0000)]
am
7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev
* commit '
7b7ef437e5b46d1173a7458ada6520778284c91a':
Don't start the keyguard until boot is done.
Alan Viverette [Fri, 26 Sep 2014 19:43:12 +0000 (19:43 +0000)]
am
81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev
* commit '
81e2f789029701b569d3c0deee8bc74fbebab5db':
Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
Michael Wright [Fri, 26 Sep 2014 19:43:08 +0000 (19:43 +0000)]
am
ff0384fa: Merge "Turn the device on if the camera lens is uncovered." into lmp-dev
* commit '
ff0384fa37801b82517897c3d0b03982d443e3c7':
Turn the device on if the camera lens is uncovered.
Martijn Coenen [Fri, 26 Sep 2014 19:43:03 +0000 (19:43 +0000)]
am
d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
* commit '
d846490a560122f9dd67d863da9ebddf81e15ba2':
Add hidden API to disable NFC (optional persist).
Paul Lawrence [Fri, 26 Sep 2014 19:42:59 +0000 (19:42 +0000)]
am
3f105532: Merge "Don\'t set dev.bootcomplete until interacting with user" into lmp-dev
* commit '
3f105532ddfd55dc9fa287bf03a751922df3bd9d':
Don't set dev.bootcomplete until interacting with user
Jorim Jaggi [Fri, 26 Sep 2014 19:42:55 +0000 (19:42 +0000)]
am
9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev
* commit '
9b20e0125f1ef129a719834874262574a2a0db9a':
Don't preload task description icons when opening recents
Selim Cinek [Fri, 26 Sep 2014 19:42:51 +0000 (19:42 +0000)]
am
9583b5a9: Merge "Fixed a bug where the QS could get stuck" into lmp-dev
* commit '
9583b5a98dc265158c667a57092688407014b9b6':
Fixed a bug where the QS could get stuck
Raph Levien [Fri, 26 Sep 2014 19:42:46 +0000 (19:42 +0000)]
am
a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev
* commit '
a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
Defer spelling correction with apostrophe
Selim Cinek [Fri, 26 Sep 2014 19:42:42 +0000 (19:42 +0000)]
am
7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev
* commit '
7f8acb8f03987a9e9f0f77c3e2500a82f1cee029':
Fixed a crash with disapearing views
Kenny Guy [Fri, 26 Sep 2014 19:42:38 +0000 (19:42 +0000)]
am
25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev
* commit '
25be3cd6719af42c41a6a99eea1034b00f39a825':
Uninstall for all users should check device admins.
RoboErik [Fri, 26 Sep 2014 19:42:33 +0000 (19:42 +0000)]
am
cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev
* commit '
cab05d54baa53bc542fa35f33e612f2c41746307':
Disable MediaSessionLegacyHelper debugging
RoboErik [Fri, 26 Sep 2014 19:42:29 +0000 (19:42 +0000)]
am
c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev
* commit '
c80873d5fa3976c5f6c238fdc98d67bc22cddb72':
Remove BT routes when BT is turned off
Selim Cinek [Fri, 26 Sep 2014 19:42:26 +0000 (19:42 +0000)]
am
a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev
* commit '
a98272456d72460e010d9b7206f82414b7d5034e':
Increased the falsing threshold when woken up by touch
Dave Burke [Fri, 26 Sep 2014 19:33:26 +0000 (19:33 +0000)]
Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
Dan Sandler [Fri, 26 Sep 2014 19:32:25 +0000 (19:32 +0000)]
Merge "Don't start the keyguard until boot is done." into lmp-dev
Jérôme Poichet [Fri, 26 Sep 2014 18:59:11 +0000 (18:59 +0000)]
Revert "Fix memory leak where we close the descriptor instead of the file."
This reverts commit
1503ebd95fc82b1ae6ec8b006e62a9f6109973fa.
Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
Kevin Ma [Fri, 26 Sep 2014 18:52:24 +0000 (18:52 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
Kevin Ma [Fri, 26 Sep 2014 18:30:37 +0000 (18:30 +0000)]
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
This reverts commit
04c6d73fd0e4472505275688ef8497bc6697647c.
Bug:
17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
Alan Viverette [Fri, 26 Sep 2014 18:45:25 +0000 (18:45 +0000)]
Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev
John Spurlock [Fri, 26 Sep 2014 17:22:08 +0000 (13:22 -0400)]
Touch-exploration improvements to volume dialog.
- Extend the dismiss timeout when interacting with various
subcontrols.
- Ensure "hover" events in touch exploration extend the timeout
in addition to touch events.
- Introduce new helper to standardize interaction callbacks.
- Announce zen toasts.
- Announce zen condition selections, and when existing countdown
conditions are modified.
Bug:
17578434
Change-Id: I8a055b3455aa8d20ba93439bdec6cc75db97800e
Michael Wright [Fri, 26 Sep 2014 18:13:54 +0000 (18:13 +0000)]
Merge "Turn the device on if the camera lens is uncovered." into lmp-dev
Martijn Coenen [Fri, 26 Sep 2014 18:08:31 +0000 (18:08 +0000)]
Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
Paul Lawrence [Fri, 26 Sep 2014 17:58:25 +0000 (17:58 +0000)]
Merge "Don't set dev.bootcomplete until interacting with user" into lmp-dev
Jorim Jaggi [Fri, 26 Sep 2014 17:57:04 +0000 (17:57 +0000)]
Merge "Don't preload task description icons when opening recents" into lmp-dev
Alan Viverette [Fri, 26 Sep 2014 17:37:30 +0000 (10:37 -0700)]
Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
BUG:
17646144
Change-Id: I58c111d86224dc8f7f557073c0bcbc22ad74aa1b
Paul Lawrence [Tue, 23 Sep 2014 21:15:24 +0000 (14:15 -0700)]
Don't set dev.bootcomplete until interacting with user
Specifically we want to not set it when encrypting and showing
progress.
Bug:
17606949
Change-Id: I668cf47781011e7fcea7aa3b43c7783b3dea77a1
Selim Cinek [Fri, 26 Sep 2014 17:14:15 +0000 (17:14 +0000)]
Merge "Fixed a bug where the QS could get stuck" into lmp-dev
Raph Levien [Fri, 26 Sep 2014 17:12:46 +0000 (17:12 +0000)]
Merge "Defer spelling correction with apostrophe" into lmp-dev
Selim Cinek [Fri, 26 Sep 2014 17:05:50 +0000 (19:05 +0200)]
Fixed a bug where the QS could get stuck
Bug:
17655858
Change-Id: I099b07504617670101b10bcbaf9fcb42cee23a1c
Jorim Jaggi [Fri, 26 Sep 2014 16:29:07 +0000 (18:29 +0200)]
Don't preload task description icons when opening recents
Bug:
17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
Jason Monk [Fri, 26 Sep 2014 16:36:51 +0000 (12:36 -0400)]
Don't start the keyguard until boot is done.
Create the KeyguardServiceDelegate but don't bind until boot is done.
Until the keyguard is bound, the delegate will assume it should be
in a secure state.
Bug:
17464800
Change-Id: I91650d1e3e3ea993168855bc3444b905aac9aac3
Selim Cinek [Fri, 26 Sep 2014 16:50:35 +0000 (16:50 +0000)]
Merge "Fixed a crash with disapearing views" into lmp-dev
xinhe [Fri, 26 Sep 2014 16:47:02 +0000 (16:47 +0000)]
Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev
Kenny Guy [Fri, 26 Sep 2014 16:36:42 +0000 (16:36 +0000)]
Merge "Uninstall for all users should check device admins." into lmp-dev
RoboErik [Fri, 26 Sep 2014 16:25:43 +0000 (16:25 +0000)]
Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev
RoboErik [Fri, 26 Sep 2014 16:25:27 +0000 (16:25 +0000)]
Merge "Remove BT routes when BT is turned off" into lmp-dev
Deepanshu Gupta [Fri, 26 Sep 2014 16:17:40 +0000 (16:17 +0000)]
am
351b7982: am
f0ebe2fa: am
f202365e: am
8c61344d: am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNa
* commit '
351b7982a933e90f5aef6571b1e0581bbc411945':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 16:17:37 +0000 (16:17 +0000)]
am
3f86a402: am
2dd837cd: (-s ours) am
416b74fe: am
ab5971d8: am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
3f86a4028bde53858a82f05ea369cc401bff6284':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 16:17:33 +0000 (16:17 +0000)]
am
90f23349: am
a7045a43: (-s ours) am
eb31708e: am
83951615: am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
90f23349cd139aedd6e3029f71763d3e0ecde0f8':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Justin Koh [Fri, 26 Sep 2014 16:17:29 +0000 (16:17 +0000)]
am
c4e233e6: am
1c487938: (-s ours) am
04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
* commit '
c4e233e660db990b9b7759f274afda88d44bd036':
Revert "DO NOT MERGE Fix race condition between binder deaths"
Craig Mautner [Fri, 26 Sep 2014 16:17:26 +0000 (16:17 +0000)]
am
0d604359: am
6ae7ea94: (-s ours) am
8828d86e: DO NOT MERGE Fix race condition between binder deaths
* commit '
0d604359272d89c7e984a9aff978cee89a9954c8':
DO NOT MERGE Fix race condition between binder deaths
Deepanshu Gupta [Fri, 26 Sep 2014 16:17:23 +0000 (16:17 +0000)]
am
7ef65757: am
9fcacf52: (-s ours) am
a6e2f226: am
14ffff15: am
c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
7ef65757bf3ed611d66f07406d6df83983d791af':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 16:17:20 +0000 (16:17 +0000)]
am
fdf5fe8f: am
ac892f68: (-s ours) am
803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
fdf5fe8f1121770839b713be257dbc3cc41613e5':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Selim Cinek [Fri, 26 Sep 2014 16:16:34 +0000 (16:16 +0000)]
Merge "Increased the falsing threshold when woken up by touch" into lmp-dev
Deepanshu Gupta [Fri, 26 Sep 2014 16:11:49 +0000 (16:11 +0000)]
am
f0ebe2fa: am
f202365e: am
8c61344d: am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NO
* commit '
f0ebe2fa14e71270e6ea159d3734c1ccc2348030':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 16:11:43 +0000 (16:11 +0000)]
am
2dd837cd: (-s ours) am
416b74fe: am
ab5971d8: am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
2dd837cdafd8ce6d2c3db7da20b92a74418f41a6':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 16:11:38 +0000 (16:11 +0000)]
am
a7045a43: (-s ours) am
eb31708e: am
83951615: am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
a7045a43ca83d65134a54236ed0ead7751ee7377':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Justin Koh [Fri, 26 Sep 2014 16:11:33 +0000 (16:11 +0000)]
am
1c487938: (-s ours) am
04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
* commit '
1c487938c45317997389b9ad101fc6739e3fe847':
Revert "DO NOT MERGE Fix race condition between binder deaths"
Craig Mautner [Fri, 26 Sep 2014 16:11:29 +0000 (16:11 +0000)]
am
6ae7ea94: (-s ours) am
8828d86e: DO NOT MERGE Fix race condition between binder deaths
* commit '
6ae7ea942fc89b1899da267253c5c78596ef5aa1':
DO NOT MERGE Fix race condition between binder deaths
Deepanshu Gupta [Fri, 26 Sep 2014 16:11:25 +0000 (16:11 +0000)]
am
9fcacf52: (-s ours) am
a6e2f226: am
14ffff15: am
c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
9fcacf52d0277b0c0485638637ea357721f8c635':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 16:11:19 +0000 (16:11 +0000)]
am
ac892f68: (-s ours) am
803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ac892f688f206eab746fac1bbe85c9f76657f8d6':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Yao Chen [Fri, 26 Sep 2014 16:02:28 +0000 (16:02 +0000)]
am
86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
* commit '
86d778155f077d5af10f43d0eb7b04584559e793':
Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
Raph Levien [Thu, 25 Sep 2014 19:50:16 +0000 (12:50 -0700)]
Defer spelling correction with apostrophe
When typing a contraction (such as "doesn't") we don't want a spell
right after the apostrophe, as this will create a false temporary red
underline, and the span split also breaks a kern pair causing text to
shift. This patch detects the case where the cursor is immediately after
such a word and suppresses correction in that case.
Bug:
17641350
Change-Id: I4d09576a31df551c96f820242fd2cbc675506dae
Yao Chen [Fri, 26 Sep 2014 15:55:51 +0000 (15:55 +0000)]
Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev
Selim Cinek [Fri, 26 Sep 2014 15:15:34 +0000 (17:15 +0200)]
Fixed a crash with disapearing views
Bug:
17660994
Change-Id: Id957bc65f0787860019c491559c4bca242ea620e
Philip Nowell [Fri, 26 Sep 2014 15:10:46 +0000 (15:10 +0000)]
am
571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
* commit '
571730b4d1a438fadfdb2c6951483f00f6276518':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
Philip Nowell [Fri, 26 Sep 2014 15:00:21 +0000 (15:00 +0000)]
Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
Selim Cinek [Fri, 26 Sep 2014 13:39:00 +0000 (15:39 +0200)]
Increased the falsing threshold when woken up by touch
Bug:
17649103
Change-Id: Iea4736a761a1108e7832aa62cc2060ea0bd89376
Przemyslaw Szczepaniak [Fri, 26 Sep 2014 09:17:53 +0000 (09:17 +0000)]
am
f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
* commit '
f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
Fix ambiguous TTS#playSilence method.
Przemyslaw Szczepaniak [Fri, 26 Sep 2014 08:11:20 +0000 (08:11 +0000)]
Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
Deepanshu Gupta [Fri, 26 Sep 2014 06:15:55 +0000 (06:15 +0000)]
am
f202365e: am
8c61344d: am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
f202365ecca0b6ed637f679c8dd3a36ff850ddfe':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 06:05:03 +0000 (06:05 +0000)]
am
8c61344d: am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
8c61344d89ab3b1f02228b3da10c8377c41960ff':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:55:34 +0000 (05:55 +0000)]
am
416b74fe: am
ab5971d8: am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
416b74fe31124d21f14bb5900f4872cdf62f08e0':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:53:47 +0000 (05:53 +0000)]
am
528b5862: am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
528b58623feee609055a31e58bf5e1ea3658bf40':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:38 +0000 (05:43 +0000)]
am
941a8f03: (-s ours) am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
941a8f03599b91f752c455dceef993887c4b9b20':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:32 +0000 (05:43 +0000)]
am
ab5971d8: am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ab5971d825d9d59f06b49e1f1e66a24df417124e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:34:34 +0000 (05:34 +0000)]
am
1489862e: am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
1489862ecee4f298de6a7b27789dda08ff4aa4cf':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:32:09 +0000 (05:32 +0000)]
am
0c4893ec: am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
0c4893ece99418842538db496bb8d53b767b335b':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:24:06 +0000 (05:24 +0000)]
am
48d0fd99: (-s ours) am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
48d0fd99f0a25829f191e7f7ed35cf8d0a2b5902':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:20:48 +0000 (05:20 +0000)]
am
2889942f: am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
2889942f4ee7762cdbd097cf3ceea16444f8841a':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:13:09 +0000 (05:13 +0000)]
am
ee41b79c: am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ee41b79c5735bb3399108bb62de1145fffff3904':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:09:54 +0000 (05:09 +0000)]
am
bfeeee8e: (-s ours) am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:02:22 +0000 (05:02 +0000)]
am
ecbe6045: am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:57:59 +0000 (04:57 +0000)]
am
7d23e405: am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:49:31 +0000 (04:49 +0000)]
am
6950920f: am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
6950920f19980a2416e156d2337b93e386b3f8be':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:40:53 +0000 (04:40 +0000)]
am
f1033174: (-s ours) am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
f103317499bdb12cbcac1754899756d22acde986':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:37:23 +0000 (04:37 +0000)]
am
1fce990c: am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
1fce990ce9098afe96e75ec1583c771826c50637':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 04:22:39 +0000 (04:22 +0000)]
am
04861ed4: am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 03:12:42 +0000 (03:12 +0000)]
am
eb31708e: am
83951615: am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
eb31708e7d14db1a54bf0f38452149c7d984517f':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 03:00:29 +0000 (03:00 +0000)]
am
83951615: am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
83951615f564521d542da00d3bf60a372787aced':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 02:49:04 +0000 (02:49 +0000)]
am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
467aea1722f5cd73d0874502447d947bccd13c99':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 02:07:42 +0000 (02:07 +0000)]
am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
a39b3b25b947d6c1ab49c08fdcd6f5149f037b20':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Svetoslav [Fri, 26 Sep 2014 01:58:29 +0000 (01:58 +0000)]
am
9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
* commit '
9ec435dca7296db68b19e03300ff814e34f84c16':
Using wrong virtual view id When prefetching accessibility nodes.
xinhe [Thu, 25 Sep 2014 23:39:28 +0000 (16:39 -0700)]
Support multiple SIM/Subscription on telephony registration
During calling telephony registry call back API, we force the call back will be
triggered if the registered subId is Default Sub ID. This is due to some risk
condition. Please refer to Issue
17472622 and its fix. This fix is ok for single
SIM/Subscription. However, on multiple SIM/subscription, there is potential problem
on wrong notifications.
Bug:
17613629
Change-Id: I3f41e03f37424bcc82a71090d4f4142b4c5ba922
Svetoslav [Fri, 26 Sep 2014 01:51:53 +0000 (01:51 +0000)]
Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
John Spurlock [Fri, 26 Sep 2014 01:48:10 +0000 (01:48 +0000)]
am
cfc1a5ee: Merge "Shorten the zen supertoast visible duration." into lmp-dev
* commit '
cfc1a5eec4bb331e22f0492c1a9b7a7f898b8960':
Shorten the zen supertoast visible duration.
Dianne Hackborn [Fri, 26 Sep 2014 01:48:06 +0000 (01:48 +0000)]
am
34b63d50: Merge "Fix issue #
17574819: Chrome browser process is killed..." into lmp-dev
* commit '
34b63d50c6e9e999eb8d5349084c12e907fb2d2d':
Fix issue #
17574819: Chrome browser process is killed...
Jesse Hall [Fri, 26 Sep 2014 01:48:01 +0000 (01:48 +0000)]
am
7fa90f6a: Merge "bootanimation: allow animation to specify background color" into lmp-dev
* commit '
7fa90f6ae5c04d96b3210a45898d1e7a8f5ef8e6':
bootanimation: allow animation to specify background color
Svetoslav [Fri, 26 Sep 2014 01:46:22 +0000 (18:46 -0700)]
Using wrong virtual view id When prefetching accessibility nodes.
When getting an accessibility node info we also prefetch its predecessors,
siblings and descendants up to fifty. If a view has a node provider, i.e.
virtual descendants, and the id of the virtual descendant is not specified
we use a speacial constant to refer that the provider should create a node
for its hosting view. The bug was that we were not using the correct constant
when calling into the provider.
bug:
17664111
Change-Id: I4f6b2333e1e7e3e2bb6b164c0752613417c60d16
John Spurlock [Fri, 26 Sep 2014 01:44:02 +0000 (01:44 +0000)]
Merge "Shorten the zen supertoast visible duration." into lmp-dev
Justin Koh [Fri, 26 Sep 2014 01:41:55 +0000 (01:41 +0000)]
am
04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
* commit '
04c6d73fd0e4472505275688ef8497bc6697647c':
Revert "DO NOT MERGE Fix race condition between binder deaths"
Dianne Hackborn [Fri, 26 Sep 2014 01:41:53 +0000 (01:41 +0000)]
Merge "Fix issue #
17574819: Chrome browser process is killed..." into lmp-dev
Jesse Hall [Fri, 26 Sep 2014 01:38:03 +0000 (01:38 +0000)]
Merge "bootanimation: allow animation to specify background color" into lmp-dev
Svetoslav [Fri, 26 Sep 2014 01:36:21 +0000 (01:36 +0000)]
am
5d5ee54e: Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev
* commit '
5d5ee54ee25cadca06afb7ebf738bc88b7d20d9a':
Invalid active window if temporary disabling accessibility for test tools.