OSDN Git Service
RoboErik [Fri, 26 Sep 2014 22:52:39 +0000 (22:52 +0000)]
Merge "Don't forward media keys to the app if the phone session is active" into lmp-dev
Elliott Hughes [Fri, 26 Sep 2014 22:52:31 +0000 (22:52 +0000)]
Merge "Set the system locale correctly even on an encrypted device." into lmp-dev
Igor Murashkin [Fri, 26 Sep 2014 22:20:11 +0000 (22:20 +0000)]
Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev
Elliott Hughes [Fri, 26 Sep 2014 19:30:47 +0000 (12:30 -0700)]
Set the system locale correctly even on an encrypted device.
Bug:
17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
RoboErik [Fri, 26 Sep 2014 19:51:01 +0000 (12:51 -0700)]
Don't forward media keys to the app if the phone session is active
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.
bug:
17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
Fabrice Di Meglio [Fri, 26 Sep 2014 20:52:01 +0000 (20:52 +0000)]
Merge "Fix bug #
17521147 Settings activity looks terrible on Volantis" into lmp-dev
Fabrice Di Meglio [Thu, 25 Sep 2014 01:48:11 +0000 (18:48 -0700)]
Fix bug #
17521147 Settings activity looks terrible on Volantis
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing
Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
John Spurlock [Fri, 26 Sep 2014 20:09:57 +0000 (20:09 +0000)]
Merge "Avoid dozing in car mode." into lmp-dev
Dianne Hackborn [Fri, 26 Sep 2014 20:06:01 +0000 (20:06 +0000)]
Merge "Fix issue #
17671802: "content" command always prints..." into lmp-dev
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: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
Dianne Hackborn [Fri, 26 Sep 2014 18:28:01 +0000 (11:28 -0700)]
Fix issue #
17671802: "content" command always prints...
..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"
Make sure to clear calling identity before getting into the guts
of the activity manager. Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.
Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
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
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
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]
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: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 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]
John Spurlock [Fri, 26 Sep 2014 00:34:31 +0000 (20:34 -0400)]
Avoid dozing in car mode.
Ensure we do not begin dozing in car mode, and end dozing when
entering car mode.
Bug:
17658724
Change-Id: I572b0d6163d2ece3b93d86981fd6cad832f96b99
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:51:53 +0000 (01:51 +0000)]
Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
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
Dianne Hackborn [Fri, 26 Sep 2014 01:34:02 +0000 (18:34 -0700)]
Fix issue #
17574819: Chrome browser process is killed...
...in background due to dying renderer process
Completely turn this off, for now.
Change-Id: I028eefc9b7e627d29569ef72d9ab940ac5960c7c
Justin Koh [Fri, 26 Sep 2014 01:29:17 +0000 (01:29 +0000)]
Revert "DO NOT MERGE Fix race condition between binder deaths"
This reverts commit
8828d86e79424fc1c7b7d1f908e3450879d5cea0.
Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
Svetoslav [Fri, 26 Sep 2014 01:28:35 +0000 (01:28 +0000)]
Merge "Invalid active window if temporary disabling accessibility for test tools." into lmp-dev
Craig Mautner [Fri, 26 Sep 2014 01:20:54 +0000 (01:20 +0000)]
am
8828d86e: DO NOT MERGE Fix race condition between binder deaths
* commit '
8828d86e79424fc1c7b7d1f908e3450879d5cea0':
DO NOT MERGE Fix race condition between binder deaths
Dianne Hackborn [Fri, 26 Sep 2014 01:15:01 +0000 (01:15 +0000)]
Merge "Work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
Alan Viverette [Fri, 26 Sep 2014 01:13:12 +0000 (01:13 +0000)]
Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
Martijn Coenen [Wed, 24 Sep 2014 04:27:30 +0000 (21:27 -0700)]
Add hidden API to disable NFC (optional persist).
Bug:
17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
Craig Mautner [Thu, 14 Aug 2014 23:08:26 +0000 (16:08 -0700)]
DO NOT MERGE Fix race condition between binder deaths
If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.
This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.
Fixes bug
17031518.
Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
(cherry picked from commit
5acd163b828d5b26408eb3a7904d750a1570239e)
Deepanshu Gupta [Fri, 26 Sep 2014 00:59:08 +0000 (00:59 +0000)]
am
91043364: am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
91043364b95fe58225437e2220d497ef6e33edf6':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:58:23 +0000 (00:58 +0000)]
am
93b185e3: am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
93b185e39c5e6a90d413ffa5a2eea740feb7364b':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:58:18 +0000 (00:58 +0000)]
am
a6e2f226: am
14ffff15: am
c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
a6e2f22666db39df527cf6698abc2420c208f02c':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Sailesh Nepal [Fri, 26 Sep 2014 00:56:09 +0000 (00:56 +0000)]
Merge "Adding support for Cdma conference calling." into lmp-dev
Philip Nowell [Thu, 25 Sep 2014 22:40:56 +0000 (15:40 -0700)]
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
Change-Id: I8b5ac84431d378f0e43be8d19920fd6ba335ebc6
Adam Lesinski [Fri, 26 Sep 2014 00:51:35 +0000 (00:51 +0000)]
Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev
Dianne Hackborn [Fri, 26 Sep 2014 00:41:34 +0000 (17:41 -0700)]
Work on issue #
17656716: Unhandled exception in Window Manager
Create descriptive errors when sending unreasonably large
parcels through IPC.
Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
Deepanshu Gupta [Fri, 26 Sep 2014 00:48:26 +0000 (00:48 +0000)]
am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
08523e680e1ec1e4ec521c7e732e60fd85f553a4':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:47:02 +0000 (00:47 +0000)]
am
14ffff15: am
c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
14ffff154f974bb169b3449ad24c508c836c670c':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:46:07 +0000 (00:46 +0000)]
am
52be792b: am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
52be792bad7cbd059daab02a23e28ef1df61f2ce':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:45:42 +0000 (00:45 +0000)]
am
363f4d4e: am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
363f4d4e2a53774b7b7c1ea995fc912291f5b84e':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:36:41 +0000 (00:36 +0000)]
am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
27d3b9264e2dcfb86400a60891a5e39cdf027d55':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:35:59 +0000 (00:35 +0000)]
am
c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:44 +0000 (00:34 +0000)]
am
803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
803a59cae71f8b5a76a48c73579ee6d3d34a78f7':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
OSDN Git Service
