OSDN Git Service
Yorke Lee [Wed, 17 Sep 2014 15:22:23 +0000 (15:22 +0000)]
am
6545889d: am
8aec4e6c: am
31e7715a: am
44b693a3: Merge "Add missing methods to Conference object" into lmp-dev
* commit '
6545889dd97dd40403ac94a8d883ed6a68301439':
Add missing methods to Conference object
Nancy Chen [Wed, 17 Sep 2014 15:22:17 +0000 (15:22 +0000)]
am
643e59b8: am
80be5455: am
af4eaa19: am
05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
* commit '
643e59b81ff96c43ac82663d4e265d19c5852301':
Remove ability to enable/disable phoneaccounts (1/6)
Andrew Lee [Wed, 17 Sep 2014 14:15:35 +0000 (14:15 +0000)]
am
64b6facb: am
e62191d3: am
c54d2d71: am
9feb839b: Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
* commit '
64b6facb830ac809af8681e36065af38231f9b47':
Fix disconnect log printf in ConnectionService.
Jungshik Jang [Wed, 17 Sep 2014 14:15:27 +0000 (14:15 +0000)]
am
446b04f5: am
0b8db057: am
f7d23fc5: am
f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
* commit '
446b04f55022bdfd56d3f39dd5877a0daeaf7395':
Adjust volume bar visibility in HDMI-CEC system audio mode
Yuncheol Heo [Wed, 17 Sep 2014 14:15:23 +0000 (14:15 +0000)]
am
762fa885: am
18e7347c: am
3d75058e: am
41f887c4: Merge "Remove MHL related code." into lmp-dev
* commit '
762fa885798721a6c2b8ccb5ea564f1751fed944':
Remove MHL related code.
mike dooley [Wed, 17 Sep 2014 14:15:18 +0000 (14:15 +0000)]
am
42fe817c: am
f563fb14: am
fb8c53ac: am
c7932a06: Merge "Fix a small printf format bug." into lmp-dev
* commit '
42fe817c5f9e2603fc70920d5d03305d1e013083':
Fix a small printf format bug.
Dianne Hackborn [Wed, 17 Sep 2014 14:14:59 +0000 (14:14 +0000)]
am
e2de4ac1: am
ff6eebd6: am
b68528cd: am
3061d2b9: Merge "Fix issue #
17507017: took ~3 seconds to move an app to the foreground" into lmp-dev
* commit '
e2de4ac106719ace45b16e822e1eff1bc289ed75':
Fix issue #
17507017: took ~3 seconds to move an app to the foreground
Dianne Hackborn [Wed, 17 Sep 2014 14:14:53 +0000 (14:14 +0000)]
am
3ca3e107: am
596d38f8: am
1e4d9476: am
1a7cb969: Merge "Fix issue #
16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev
* commit '
3ca3e107acec9967c3d8b6ea819835f4f9b14b87':
Fix issue #
16662560: SingleTop activity is getting instantiated multiple time
Robert Greenwalt [Wed, 17 Sep 2014 14:14:49 +0000 (14:14 +0000)]
am
e6068c9b: am
82c8eb07: am
061ac1be: am
d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
* commit '
e6068c9bf5675d02cc2aefff011c06542362fe74':
Add NetworkAgent event for ExplicitlySelected
Adrian Roos [Wed, 17 Sep 2014 14:14:26 +0000 (14:14 +0000)]
am
8eaf99a9: am
81171856: am
bf665282: am
8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
* commit '
8eaf99a9a5a3062e928ee9c3025c12c31c57b7d8':
Fix broken dispatch of onApplyWindowInsets
Brian Attwell [Wed, 17 Sep 2014 14:14:21 +0000 (14:14 +0000)]
am
827cb4a2: am
579aff33: am
9c943a94: am
56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
* commit '
827cb4a224028e8b05ec5e864ce94abd81e23e82':
Pass different dy into dispatchNestedSCroll
Alan Viverette [Wed, 17 Sep 2014 14:13:58 +0000 (14:13 +0000)]
am
a19e77b2: am
a6b5de59: am
b22bd84e: am
67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
* commit '
a19e77b242c326129509b7fc442d5e54204c90f4':
Preserve NPE behavior of removed TextView.getTextColors() API
Alan Viverette [Wed, 17 Sep 2014 14:13:54 +0000 (14:13 +0000)]
am
e58f16ec: am
ab1770df: am
86633337: am
07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
* commit '
e58f16ecb903eb4ca280d427a77a4c3c49a6926f':
Fix TimePicker.setCurrentHour() when argument is 0
Alan Viverette [Wed, 17 Sep 2014 14:13:49 +0000 (14:13 +0000)]
am
084a8ea4: am
b3a5b02a: am
27cf6cec: am
37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
* commit '
084a8ea4729c13f791015adb6c284bc3111f2796':
Ensure we always have valid colors in CaptionStyle
ztenghui [Wed, 17 Sep 2014 14:13:44 +0000 (14:13 +0000)]
am
c4d5965c: am
74315653: am
ff2c92d7: am
0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev
* commit '
c4d5965c2f3636b84dcd1c2bc80c9acf0a881a48':
Update the progress bar to square instead of round lineCap
Robert Greenwalt [Wed, 17 Sep 2014 14:13:31 +0000 (14:13 +0000)]
am
4b975101: am
46d6a418: am
3a68c1e8: am
c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev
* commit '
4b9751019ff25b61b84e2a8c6955f38d727efb73':
Report Network status to NetworkAgent.
Craig Mautner [Wed, 17 Sep 2014 14:13:27 +0000 (14:13 +0000)]
am
fa26c157: am
0fb3fdab: am
bfff2d63: am
880d88b3: Merge "Restore changes that were needed." into lmp-dev
* commit '
fa26c15724693e90c6c32486cb0f4ec6f3fcc0a6':
Restore changes that were needed.
Alan Viverette [Wed, 17 Sep 2014 14:13:22 +0000 (14:13 +0000)]
am
8a479813: am
bd2e7680: am
a81d8c8b: am
af3be19b: Merge "Increase clock and calendar haptic feedback durations" into lmp-dev
* commit '
8a4798133206358fdd41899430d20550a4cffe37':
Increase clock and calendar haptic feedback durations
Craig Mautner [Wed, 17 Sep 2014 14:13:10 +0000 (14:13 +0000)]
am
05216ac8: am
675a6e4d: am
3d94fdac: am
b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev
* commit '
05216ac82ab73b3b0db3804516036d7902bbe380':
Revert "Fix various bugs in DatePickerCalendarDelegate"
John Spurlock [Wed, 17 Sep 2014 14:12:56 +0000 (14:12 +0000)]
am
dfd0f737: am
fe948fde: am
cd1cba7d: am
183cd994: Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev
* commit '
dfd0f737c7a49335bf916b2c7446a3ce78ba4d3d':
Zen: Fix recent regression in mode selection after reboot.
Andrew Lee [Wed, 17 Sep 2014 14:12:51 +0000 (14:12 +0000)]
am
8074424b: am
df23ff67: am
14f6fff6: am
258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev
* commit '
8074424b69f0bddf4a802e9650eba6a6ca733b4f':
Add new DisconnectCause class to telecomm.
Craig Mautner [Wed, 17 Sep 2014 14:12:40 +0000 (14:12 +0000)]
am
16600a52: am
73ccaa21: am
af31daa1: am
459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev
* commit '
16600a52c33168c83208d5227996c4a553e343dd':
Fix various bugs in DatePickerCalendarDelegate
Svetoslav [Wed, 17 Sep 2014 14:12:27 +0000 (14:12 +0000)]
am
34a7ef08: am
5c151cae: am
d6a1b7ed: am
03371fde: Merge "Print preview disappearing on screen off/on." into lmp-dev
* commit '
34a7ef08958a3304a77346a24695683126a69a36':
Print preview disappearing on screen off/on.
Amit Mahajan [Wed, 17 Sep 2014 14:12:22 +0000 (14:12 +0000)]
am
56a22fcf: am
b2697356: am
d425fd52: am
c5429d6f: Merge "Use Op package name when creating toasts" into lmp-dev
* commit '
56a22fcfaf55f726e4dbb6cc4de7d4b74c6db745':
Use Op package name when creating toasts
Jeff Sharkey [Wed, 17 Sep 2014 14:11:45 +0000 (14:11 +0000)]
am
95f896d9: am
2f984f96: am
1b5f6fec: am
2dc7a1b5: Merge "Always force list divider in DocumentsUI." into lmp-dev
* commit '
95f896d9f1723bde48280fa9ba5438d6857c6eb7':
Always force list divider in DocumentsUI.
Svetoslav [Wed, 17 Sep 2014 05:15:22 +0000 (05:15 +0000)]
am
6f24a5c2: am
bce7a884: am
79541afa: am
ccf13317: Merge "Do not change fragments if print activity finishing." into lmp-dev
* commit '
6f24a5c2a092136706f0921c4876c4a10f7a3ba6':
Do not change fragments if print activity finishing.
Ji-Hwan Lee [Wed, 17 Sep 2014 05:15:09 +0000 (05:15 +0000)]
am
fc98fb99: am
a632834c: am
3b2f7353: am
444a0f2d: TIF: Re-connect the session on package update.
* commit '
fc98fb9900dd12311e04555f771a1d37209a60eb':
TIF: Re-connect the session on package update.
Deepanshu Gupta [Wed, 17 Sep 2014 05:15:00 +0000 (05:15 +0000)]
am
f2525aa9: am
885f91f7: am
820d90e2: am
69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev
* commit '
f2525aa9f8baa8662904ee1b027a0018460baf21':
Build LayoutLib tests with Java 6
Alan Viverette [Wed, 17 Sep 2014 05:14:55 +0000 (05:14 +0000)]
am
8823d2cc: am
f01a39bf: am
5191c40b: am
7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev
* commit '
8823d2cc48d52d6aea3f3233d9bf44d302757763':
Properly handle dispatchRestoreInstanceState for new-style DatePicker
Jorim Jaggi [Wed, 17 Sep 2014 05:14:49 +0000 (05:14 +0000)]
am
fb2fa955: am
185055cb: am
dc29e524: am
ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev
* commit '
fb2fa955e92e6066e21badebf16259acdcebae12':
Use RenderThread for navigation bar ripples
PauloftheWest [Wed, 17 Sep 2014 05:14:44 +0000 (05:14 +0000)]
am
92c03928: am
41d51c47: am
ada3e529: am
0208bf01: Merge "Fixed an RTL overlapping issue in volume settings." into lmp-dev
* commit '
92c03928f315511f88c92b5bfae6e922cea20764':
Fixed an RTL overlapping issue in volume settings.
Martijn Coenen [Wed, 17 Sep 2014 05:14:32 +0000 (05:14 +0000)]
am
6d1b1735: am
616273b6: am
0268b22d: am
415ef692: Merge "Fix static AID prefix registration." into lmp-dev
* commit '
6d1b17352ede80eb46f2c79afd267d5d6460f0d4':
Fix static AID prefix registration.
Yorke Lee [Wed, 17 Sep 2014 04:25:05 +0000 (04:25 +0000)]
am
8aec4e6c: am
31e7715a: am
44b693a3: Merge "Add missing methods to Conference object" into lmp-dev
* commit '
8aec4e6c56fae36b300344d27a26ee78155f48e7':
Add missing methods to Conference object
Nancy Chen [Wed, 17 Sep 2014 04:24:57 +0000 (04:24 +0000)]
am
80be5455: am
af4eaa19: am
05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
* commit '
80be545517252661425be9219aa7ee165caec4ed':
Remove ability to enable/disable phoneaccounts (1/6)
Yorke Lee [Wed, 17 Sep 2014 03:59:57 +0000 (03:59 +0000)]
am
31e7715a: am
44b693a3: Merge "Add missing methods to Conference object" into lmp-dev
* commit '
31e7715aff6e6b19e9f104baf7e590b387da8d8b':
Add missing methods to Conference object
Nancy Chen [Wed, 17 Sep 2014 03:59:53 +0000 (03:59 +0000)]
am
af4eaa19: am
05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
* commit '
af4eaa198af6f99387c09982fa9a40371ba4e16c':
Remove ability to enable/disable phoneaccounts (1/6)
Yorke Lee [Wed, 17 Sep 2014 03:41:10 +0000 (03:41 +0000)]
am
44b693a3: Merge "Add missing methods to Conference object" into lmp-dev
* commit '
44b693a3cdee9908223723e961a29fbfc0305163':
Add missing methods to Conference object
Nancy Chen [Wed, 17 Sep 2014 03:41:02 +0000 (03:41 +0000)]
am
05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
* commit '
05a2c7ef905777fdbc1129146df6f389e2e6980a':
Remove ability to enable/disable phoneaccounts (1/6)
Yorke Lee [Wed, 17 Sep 2014 03:29:11 +0000 (03:29 +0000)]
Merge "Add missing methods to Conference object" into lmp-dev
Nancy Chen [Wed, 17 Sep 2014 03:23:03 +0000 (03:23 +0000)]
Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev
Andrew Lee [Wed, 17 Sep 2014 02:51:01 +0000 (02:51 +0000)]
am
e62191d3: am
c54d2d71: am
9feb839b: Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
* commit '
e62191d3271dd4064889b3057318ce4acd6f9922':
Fix disconnect log printf in ConnectionService.
Andrew Lee [Wed, 17 Sep 2014 02:35:53 +0000 (02:35 +0000)]
am
c54d2d71: am
9feb839b: Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
* commit '
c54d2d71b75285254c223f64ecdee3288ed2485f':
Fix disconnect log printf in ConnectionService.
Jungshik Jang [Wed, 17 Sep 2014 02:21:33 +0000 (02:21 +0000)]
am
0b8db057: am
f7d23fc5: am
f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
* commit '
0b8db0578032bd3f3fda8b6a1db7b6dcb42101b0':
Adjust volume bar visibility in HDMI-CEC system audio mode
Yuncheol Heo [Wed, 17 Sep 2014 02:21:27 +0000 (02:21 +0000)]
am
18e7347c: am
3d75058e: am
41f887c4: Merge "Remove MHL related code." into lmp-dev
* commit '
18e7347c45fe0ae9a2be76f07a5b9259302d9314':
Remove MHL related code.
mike dooley [Wed, 17 Sep 2014 02:21:23 +0000 (02:21 +0000)]
am
f563fb14: am
fb8c53ac: am
c7932a06: Merge "Fix a small printf format bug." into lmp-dev
* commit '
f563fb14d1696deddfc0542e24e12fdc9a033079':
Fix a small printf format bug.
Andrew Lee [Wed, 17 Sep 2014 02:00:31 +0000 (02:00 +0000)]
am
9feb839b: Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
* commit '
9feb839b7d77654dc7598b5c2f85aaa06be81e9d':
Fix disconnect log printf in ConnectionService.
Jungshik Jang [Wed, 17 Sep 2014 02:00:27 +0000 (02:00 +0000)]
am
f7d23fc5: am
f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
* commit '
f7d23fc59c64024249489605adc7409f47192555':
Adjust volume bar visibility in HDMI-CEC system audio mode
Yuncheol Heo [Wed, 17 Sep 2014 02:00:23 +0000 (02:00 +0000)]
am
3d75058e: am
41f887c4: Merge "Remove MHL related code." into lmp-dev
* commit '
3d75058eafd11a6adc0907a1534b8505bbc8b937':
Remove MHL related code.
mike dooley [Wed, 17 Sep 2014 02:00:19 +0000 (02:00 +0000)]
am
fb8c53ac: am
c7932a06: Merge "Fix a small printf format bug." into lmp-dev
* commit '
fb8c53ac0c464679b8bec4a38cea870ecdb52abb':
Fix a small printf format bug.
Andrew Lee [Wed, 17 Sep 2014 01:52:53 +0000 (01:52 +0000)]
Merge "Fix disconnect log printf in ConnectionService." into lmp-dev
Jungshik Jang [Wed, 17 Sep 2014 01:38:25 +0000 (01:38 +0000)]
am
f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
* commit '
f88be2c79ab5cb980fee2fff22c41d62100f4165':
Adjust volume bar visibility in HDMI-CEC system audio mode
Yuncheol Heo [Wed, 17 Sep 2014 01:38:21 +0000 (01:38 +0000)]
am
41f887c4: Merge "Remove MHL related code." into lmp-dev
* commit '
41f887c4620cb33041b2844314770c56605d2679':
Remove MHL related code.
mike dooley [Wed, 17 Sep 2014 01:38:15 +0000 (01:38 +0000)]
am
c7932a06: Merge "Fix a small printf format bug." into lmp-dev
* commit '
c7932a06f76db95a44163d1feb68dcc8af411627':
Fix a small printf format bug.
Jungshik Jang [Wed, 17 Sep 2014 01:29:53 +0000 (01:29 +0000)]
Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev
Jungshik Jang [Tue, 16 Sep 2014 02:04:54 +0000 (11:04 +0900)]
Adjust volume bar visibility in HDMI-CEC system audio mode
When HDMI-CEC system audio mode is activated.
1. Hide volume bar when volume button is pressed in TV
2. Show volume bar when TV receives volume notification from
Audio Receiver.
Otherwise, (system audio mode off) follows normal TV's behavior.
Bug:
17347499
Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
Yuncheol Heo [Wed, 17 Sep 2014 01:28:25 +0000 (01:28 +0000)]
Merge "Remove MHL related code." into lmp-dev
mike dooley [Wed, 17 Sep 2014 01:25:13 +0000 (01:25 +0000)]
Merge "Fix a small printf format bug." into lmp-dev
Andrew Lee [Wed, 17 Sep 2014 01:14:59 +0000 (18:14 -0700)]
Fix disconnect log printf in ConnectionService.
Bug:
17534940
Change-Id: I41499701d1f7a3ab0816624d27094c6c86fb5b01
Yuncheol Heo [Wed, 17 Sep 2014 01:15:40 +0000 (10:15 +0900)]
Remove MHL related code.
Bug:
17479050
Change-Id: Id4a76ccf7325c78817d1b3c3460e5dc40e23831b
mike dooley [Wed, 17 Sep 2014 00:33:40 +0000 (17:33 -0700)]
Fix a small printf format bug.
Bug:
17534940
Change-Id: Idc3c1105c72714f138b07012d0ad9e0bf0ba17f1
Dianne Hackborn [Wed, 17 Sep 2014 00:40:55 +0000 (00:40 +0000)]
am
ff6eebd6: am
b68528cd: am
3061d2b9: Merge "Fix issue #
17507017: took ~3 seconds to move an app to the foreground" into lmp-dev
* commit '
ff6eebd62ba3e17840c5e3b75db25c801ddf0f21':
Fix issue #
17507017: took ~3 seconds to move an app to the foreground
Dianne Hackborn [Wed, 17 Sep 2014 00:40:51 +0000 (00:40 +0000)]
am
596d38f8: am
1e4d9476: am
1a7cb969: Merge "Fix issue #
16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev
* commit '
596d38f8173cfba1e014c352110989d0837754c1':
Fix issue #
16662560: SingleTop activity is getting instantiated multiple time
Robert Greenwalt [Wed, 17 Sep 2014 00:40:47 +0000 (00:40 +0000)]
am
82c8eb07: am
061ac1be: am
d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
* commit '
82c8eb07204a8e1366b6e15678489a86b9f3f108':
Add NetworkAgent event for ExplicitlySelected
Dianne Hackborn [Wed, 17 Sep 2014 00:28:11 +0000 (00:28 +0000)]
am
b68528cd: am
3061d2b9: Merge "Fix issue #
17507017: took ~3 seconds to move an app to the foreground" into lmp-dev
* commit '
b68528cd3fda0b10064fdd4d9f4ef79afacaac2a':
Fix issue #
17507017: took ~3 seconds to move an app to the foreground
Dianne Hackborn [Wed, 17 Sep 2014 00:28:07 +0000 (00:28 +0000)]
am
1e4d9476: am
1a7cb969: Merge "Fix issue #
16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev
* commit '
1e4d9476d4313e352b80d53ccf36bd9a6e844e72':
Fix issue #
16662560: SingleTop activity is getting instantiated multiple time
Robert Greenwalt [Wed, 17 Sep 2014 00:28:04 +0000 (00:28 +0000)]
am
061ac1be: am
d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
* commit '
061ac1be70acff38bb2caa58bd3b6ea08c2e79a9':
Add NetworkAgent event for ExplicitlySelected
Dianne Hackborn [Wed, 17 Sep 2014 00:21:04 +0000 (00:21 +0000)]
am
3061d2b9: Merge "Fix issue #
17507017: took ~3 seconds to move an app to the foreground" into lmp-dev
* commit '
3061d2b984eed5b9e2d60748cea0a111ba52c758':
Fix issue #
17507017: took ~3 seconds to move an app to the foreground
Dianne Hackborn [Wed, 17 Sep 2014 00:21:00 +0000 (00:21 +0000)]
am
1a7cb969: Merge "Fix issue #
16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev
* commit '
1a7cb969b833be16632cbcadc498a1fb978ca659':
Fix issue #
16662560: SingleTop activity is getting instantiated multiple time
Adrian Roos [Wed, 17 Sep 2014 00:17:42 +0000 (00:17 +0000)]
am
81171856: am
bf665282: am
8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
* commit '
811718564174f9dcbe7140e260118272b4e5f672':
Fix broken dispatch of onApplyWindowInsets
Dianne Hackborn [Wed, 17 Sep 2014 00:14:43 +0000 (00:14 +0000)]
Merge "Fix issue #
17507017: took ~3 seconds to move an app to the foreground" into lmp-dev
Robert Greenwalt [Wed, 17 Sep 2014 00:13:54 +0000 (00:13 +0000)]
am
d0675e37: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
* commit '
d0675e37718d3223623e4fbf0f5e8e0e46c10d5f':
Add NetworkAgent event for ExplicitlySelected
Dianne Hackborn [Wed, 17 Sep 2014 00:13:37 +0000 (00:13 +0000)]
Merge "Fix issue #
16662560: SingleTop activity is getting instantiated multiple time" into lmp-dev
Brian Attwell [Wed, 17 Sep 2014 00:08:45 +0000 (00:08 +0000)]
am
579aff33: am
9c943a94: am
56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
* commit '
579aff33138e54190e7e6de37dec7a66902decd1':
Pass different dy into dispatchNestedSCroll
Robert Greenwalt [Wed, 17 Sep 2014 00:06:02 +0000 (00:06 +0000)]
Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
Adrian Roos [Wed, 17 Sep 2014 00:05:58 +0000 (00:05 +0000)]
am
bf665282: am
8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
* commit '
bf665282fe1a0b7caf9dc5a2b3ba5378d3ac35f3':
Fix broken dispatch of onApplyWindowInsets
Robert Greenwalt [Sun, 7 Sep 2014 23:50:01 +0000 (16:50 -0700)]
Add NetworkAgent event for ExplicitlySelected
Lets Wifi tell us when the user selected this AP vs auto-connected.
bug:
17396168
Change-Id: I6e067ab62ed49040629aa31fe07ff880d3d542f0
Adrian Roos [Tue, 16 Sep 2014 23:58:07 +0000 (23:58 +0000)]
am
8f4cafc2: Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
* commit '
8f4cafc281eb2c40b409f86ad276b4337f5fd317':
Fix broken dispatch of onApplyWindowInsets
Alan Viverette [Tue, 16 Sep 2014 23:55:14 +0000 (23:55 +0000)]
am
a6b5de59: am
b22bd84e: am
67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
* commit '
a6b5de599ec3eb70ece0cc1ec86fdf78440be363':
Preserve NPE behavior of removed TextView.getTextColors() API
Alan Viverette [Tue, 16 Sep 2014 23:55:10 +0000 (23:55 +0000)]
am
ab1770df: am
86633337: am
07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
* commit '
ab1770dfc89f57ec03593f6384a692d353839eac':
Fix TimePicker.setCurrentHour() when argument is 0
Alan Viverette [Tue, 16 Sep 2014 23:55:06 +0000 (23:55 +0000)]
am
b3a5b02a: am
27cf6cec: am
37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
* commit '
b3a5b02a4690fbd9c3e4c8c12b884d5ba4722d0f':
Ensure we always have valid colors in CaptionStyle
ztenghui [Tue, 16 Sep 2014 23:55:03 +0000 (23:55 +0000)]
am
74315653: am
ff2c92d7: am
0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev
* commit '
74315653b183f2b28326282d1cac319466f4e60a':
Update the progress bar to square instead of round lineCap
Brian Attwell [Tue, 16 Sep 2014 23:54:57 +0000 (23:54 +0000)]
am
9c943a94: am
56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
* commit '
9c943a94ad9926611ca960b9abd481a7e7ad1263':
Pass different dy into dispatchNestedSCroll
Brian Attwell [Tue, 16 Sep 2014 23:45:03 +0000 (23:45 +0000)]
am
56d143ae: Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
* commit '
56d143ae20eb731d2826fe6efdf330f3c7c14071':
Pass different dy into dispatchNestedSCroll
Adrian Roos [Tue, 16 Sep 2014 23:42:38 +0000 (23:42 +0000)]
Merge "Fix broken dispatch of onApplyWindowInsets" into lmp-dev
Alan Viverette [Tue, 16 Sep 2014 23:41:35 +0000 (23:41 +0000)]
am
b22bd84e: am
67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
* commit '
b22bd84e6cb81a1e27688011631498f441f6f393':
Preserve NPE behavior of removed TextView.getTextColors() API
Alan Viverette [Tue, 16 Sep 2014 23:41:31 +0000 (23:41 +0000)]
am
86633337: am
07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
* commit '
866333376e1a6933e194ab8989b77c84be8ad334':
Fix TimePicker.setCurrentHour() when argument is 0
Alan Viverette [Tue, 16 Sep 2014 23:41:27 +0000 (23:41 +0000)]
am
27cf6cec: am
37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
* commit '
27cf6cecf11c6afa918ff860ccb2f24ae94b38af':
Ensure we always have valid colors in CaptionStyle
ztenghui [Tue, 16 Sep 2014 23:41:24 +0000 (23:41 +0000)]
am
ff2c92d7: am
0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev
* commit '
ff2c92d72087b73de7393261670a74f504e5110e':
Update the progress bar to square instead of round lineCap
Brian Attwell [Tue, 16 Sep 2014 23:33:23 +0000 (23:33 +0000)]
Merge "Pass different dy into dispatchNestedSCroll" into lmp-dev
Alan Viverette [Tue, 16 Sep 2014 23:30:54 +0000 (23:30 +0000)]
am
67798394: Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
* commit '
67798394819f1b8af9afb8f35fda0d0f0552f027':
Preserve NPE behavior of removed TextView.getTextColors() API
Alan Viverette [Tue, 16 Sep 2014 23:30:50 +0000 (23:30 +0000)]
am
07e867a0: Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
* commit '
07e867a059a6bef19fb92663d02a03a90cd356e8':
Fix TimePicker.setCurrentHour() when argument is 0
Alan Viverette [Tue, 16 Sep 2014 23:30:46 +0000 (23:30 +0000)]
am
37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
* commit '
37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef':
Ensure we always have valid colors in CaptionStyle
ztenghui [Tue, 16 Sep 2014 23:30:42 +0000 (23:30 +0000)]
am
0fed84e1: Merge "Update the progress bar to square instead of round lineCap" into lmp-dev
* commit '
0fed84e1e4674353892143103ba0ebdf36b0c71d':
Update the progress bar to square instead of round lineCap
Robert Greenwalt [Tue, 16 Sep 2014 23:26:37 +0000 (23:26 +0000)]
am
46d6a418: am
3a68c1e8: am
c8f6ad36: Merge "Report Network status to NetworkAgent." into lmp-dev
* commit '
46d6a41885024bf3dee51f03c4b3f24a0bbb08f6':
Report Network status to NetworkAgent.
Craig Mautner [Tue, 16 Sep 2014 23:26:33 +0000 (23:26 +0000)]
am
0fb3fdab: am
bfff2d63: am
880d88b3: Merge "Restore changes that were needed." into lmp-dev
* commit '
0fb3fdab440d21c0e52d9db1b81fb1bd489adec9':
Restore changes that were needed.
Alan Viverette [Tue, 16 Sep 2014 23:26:30 +0000 (23:26 +0000)]
am
bd2e7680: am
a81d8c8b: am
af3be19b: Merge "Increase clock and calendar haptic feedback durations" into lmp-dev
* commit '
bd2e76805a51a60f74697b468a557762d905fe64':
Increase clock and calendar haptic feedback durations
Alan Viverette [Tue, 16 Sep 2014 23:25:07 +0000 (23:25 +0000)]
Merge "Preserve NPE behavior of removed TextView.getTextColors() API" into lmp-dev
Alan Viverette [Tue, 16 Sep 2014 23:23:22 +0000 (23:23 +0000)]
Merge "Fix TimePicker.setCurrentHour() when argument is 0" into lmp-dev
Dianne Hackborn [Tue, 16 Sep 2014 18:11:23 +0000 (11:11 -0700)]
Fix issue #
16662560: SingleTop activity is getting instantiated multiple time
Introduce a concept of a "root affinity" to a task -- this is the
affinity of the initial activity in the task. Use this instead of
the current affinity in findTaskLocked(), where we look for an
existing task to use for a NEW_TASK intent.
This changes the semantics of the new "relinquish task identity" mode
so that it doesn't relinquish the root affinity of the task. This
means when we are in the old style application-based recents matching
of findTaskLocked(), we will never count these tasks as the same as
the application's tasks only because they have relinquished their
identity to that application. This is probably okay, it is basically
putting a different line between new document-centric recents and
old application-centric recents when they are mixed together.
Change-Id: I73a22ead9bd08e98bf67ad035a017f828c6a6715
Alan Viverette [Tue, 16 Sep 2014 23:20:27 +0000 (23:20 +0000)]
Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev
OSDN Git Service
