git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Chet Haase [Mon, 29 Aug 2016 23:01:21 +0000 (23:01 +0000)]

Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am: 59fb472858 am: 6a8b5585aa
am: d987f227e1

Change-Id: I9e178a29010007c34a7cd482182dad64f1d6c8cb

commit | commitdiff | tree

Yuichi Biwa [Mon, 29 Aug 2016 23:01:17 +0000 (23:01 +0000)]

ChooserActivity: Cannot start app that the icon overflows the layout am: cb3e1237b5 am: 96ecd77dc8
am: d728854401

Change-Id: I855dfdf9ec070257f116db89e9da971c9de09aa0

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 23:01:14 +0000 (23:01 +0000)]

Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am: 22e006214c am: 26849eca9c
am: 20c29b0c9b

Change-Id: I06de8e949e19c6cde0295c755bb1f69f79964f0c

commit | commitdiff | tree

Alan Viverette [Mon, 29 Aug 2016 22:48:54 +0000 (22:48 +0000)]

Set up view state before attaching, jump drawables if needed am: c328f042a6 -s ours am: 54e7cbe563
am: 257d8ea408

Change-Id: I79bd3d710dab173bf1d892b8ec970ac05f130354

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:48:49 +0000 (22:48 +0000)]

Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am: a1bbb76806 am: 373f7c04fd
am: d89f74710c

Change-Id: If02b5443197d9fc4e36f2c43a323363e428c1781

commit | commitdiff | tree

Adam Powell [Mon, 29 Aug 2016 22:48:43 +0000 (22:48 +0000)]

Force AlertDialogLayout to have gravity start|top am: 00c4f7ba65 am: 96bdf5ca7b
am: 5d7e5ef0ef

Change-Id: Ibbb35620af83ec25d147ae40cdd6e850b8741878

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:48:39 +0000 (22:48 +0000)]

Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am: c80a4d7ae3 am: 6ff5fafeca
am: 73b9053643

Change-Id: Ib1fb4a961708e5bd5d0e567967b64e8babe97e0d

commit | commitdiff | tree

Abodunrinwa Toki [Mon, 29 Aug 2016 22:48:36 +0000 (22:48 +0000)]

FloatingActionMode: Fix screen coordinates. am: 99c340cad9 am: cba50af05e
am: 7571fabd8a

Change-Id: I2df45da079c89819a9490fdb47fda9fd06be6206

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:43:58 +0000 (22:43 +0000)]

Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am: 59fb472858
am: 6a8b5585aa

Change-Id: I0142ece58fb6e7029df4ef1345100d364a440022

commit | commitdiff | tree

Yuichi Biwa [Mon, 29 Aug 2016 22:43:56 +0000 (22:43 +0000)]

ChooserActivity: Cannot start app that the icon overflows the layout am: cb3e1237b5
am: 96ecd77dc8

Change-Id: Ic03480ad585a21c11b57090e1e1c81fc42e446d7

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:43:53 +0000 (22:43 +0000)]

Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am: 22e006214c
am: 26849eca9c

Change-Id: Ie35d0812808f9ffae24657ad54f4780f9a237f2f

commit | commitdiff | tree

Alan Viverette [Mon, 29 Aug 2016 22:40:34 +0000 (22:40 +0000)]

Set up view state before attaching, jump drawables if needed am: c328f042a6 -s ours
am: 54e7cbe563

Change-Id: Ic153d5df90cd74ba7b0fc8b1a3c3e7af06e7f7f9

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:40:31 +0000 (22:40 +0000)]

Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am: a1bbb76806
am: 373f7c04fd

Change-Id: I031361a3be5aa73b9208cc93189013a68084ce53

commit | commitdiff | tree

Adam Powell [Mon, 29 Aug 2016 22:40:28 +0000 (22:40 +0000)]

Force AlertDialogLayout to have gravity start|top am: 00c4f7ba65
am: 96bdf5ca7b

Change-Id: Ib0579121436fe955091704f62429e1ebfb2ef7bd

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:40:25 +0000 (22:40 +0000)]

Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am: c80a4d7ae3
am: 6ff5fafeca

Change-Id: Ibb300e7a0f86c3db1c9909d710c928daefcff519

commit | commitdiff | tree

Abodunrinwa Toki [Mon, 29 Aug 2016 22:40:22 +0000 (22:40 +0000)]

FloatingActionMode: Fix screen coordinates. am: 99c340cad9
am: cba50af05e

Change-Id: I6fd86900a22b3eac2750786a34782a0d39bd6d88

commit | commitdiff | tree

Fei Wu [Mon, 29 Aug 2016 22:32:58 +0000 (22:32 +0000)]

Merge "Use png for switch in SwitchPreference on watch" into cw-f-dev

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:31:37 +0000 (22:31 +0000)]

Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev
am: 59fb472858

Change-Id: I68cef7811c79e264c685fcaae30b501d29789af5

commit | commitdiff | tree

Yuichi Biwa [Mon, 29 Aug 2016 22:31:33 +0000 (22:31 +0000)]

ChooserActivity: Cannot start app that the icon overflows the layout
am: cb3e1237b5

Change-Id: I93bb2ff3a13f31f6ce6d2ab7161eba3f1be17999

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:31:28 +0000 (22:31 +0000)]

Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev
am: 22e006214c

Change-Id: Ib19c9f7c09574796d8446f2195323d78aa6b8811

commit | commitdiff | tree

Alan Viverette [Mon, 29 Aug 2016 22:31:24 +0000 (22:31 +0000)]

Set up view state before attaching, jump drawables if needed
am: c328f042a6 -s ours

Change-Id: If8eeea4957a19389c9fea47bd0b31dbcc5d51b21

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:31:20 +0000 (22:31 +0000)]

Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
am: a1bbb76806

Change-Id: I1f1d1efab0844204df403fdc7619b6c6d8b1fb77

commit | commitdiff | tree

Adam Powell [Mon, 29 Aug 2016 22:31:16 +0000 (22:31 +0000)]

Force AlertDialogLayout to have gravity start|top
am: 00c4f7ba65

Change-Id: If329f03f0475cb0b65ed62d97ee97285f8d24038

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:31:09 +0000 (22:31 +0000)]

Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev
am: c80a4d7ae3

Change-Id: I39589f091b9f34581f20323e721a3d1ab2887c32

commit | commitdiff | tree

Abodunrinwa Toki [Mon, 29 Aug 2016 22:31:04 +0000 (22:31 +0000)]

FloatingActionMode: Fix screen coordinates.
am: 99c340cad9

Change-Id: If69592a88c5296d1321a08d78231492efaac6645

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:13:09 +0000 (22:13 +0000)]

Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:12:07 +0000 (22:12 +0000)]

Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:11:25 +0000 (22:11 +0000)]

Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev

commit | commitdiff | tree

Chet Haase [Mon, 29 Aug 2016 22:11:07 +0000 (22:11 +0000)]

Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev

commit | commitdiff | tree

Christopher Tate [Mon, 29 Aug 2016 22:09:40 +0000 (22:09 +0000)]

Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am: 2bbfe98062 am: e9ca3ec441
am: 69bac672b4

Change-Id: I1c779e2a5d8545c1dea1f571d31bfde7dc1a1576

commit | commitdiff | tree

Christopher Tate [Mon, 29 Aug 2016 22:09:38 +0000 (22:09 +0000)]

Eliminate next-alarm-clock broadcast flapping am: c60da1edc1 am: ef05b70110
am: 4da1432fe6

Change-Id: I3172e8a51c86ae60fea4c6e8982f7aff4949829d

commit | commitdiff | tree

Philip P. Moltmann [Mon, 29 Aug 2016 22:02:41 +0000 (22:02 +0000)]

Merge "Size print destination to support font sizing" into nyc-mr1-dev
am: 47758a178a

Change-Id: I026174d0dea5daac76ce512e7e19df1fd4437750

commit | commitdiff | tree

Philip P. Moltmann [Mon, 29 Aug 2016 22:02:36 +0000 (22:02 +0000)]

Size print destination to support font sizing
am: cb1926afba

Change-Id: I2c49f14994f07c719457c2bdf88ddec874ff0014

commit | commitdiff | tree

Christopher Tate [Mon, 29 Aug 2016 22:02:29 +0000 (22:02 +0000)]

Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am: 2bbfe98062
am: e9ca3ec441

Change-Id: I1b378ebf26f1be3699a529b7bc301d9cc559f3f2

commit | commitdiff | tree

Christopher Tate [Mon, 29 Aug 2016 22:02:25 +0000 (22:02 +0000)]

Eliminate next-alarm-clock broadcast flapping am: c60da1edc1
am: ef05b70110

Change-Id: Iafc27e38c3831edcfb048722d1b3a43b0cdca72e

commit | commitdiff | tree

TreeHugger Robot [Mon, 29 Aug 2016 21:57:15 +0000 (21:57 +0000)]

Merge "Size print destination to support font sizing" into nyc-mr1-dev

commit | commitdiff | tree

Christopher Tate [Mon, 29 Aug 2016 21:55:38 +0000 (21:55 +0000)]

Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
am: 2bbfe98062

Change-Id: I05c5b636f7edec76ab85c4e9b9d248c41acb4157

commit | commitdiff | tree

Christopher Tate [Mon, 29 Aug 2016 21:55:30 +0000 (21:55 +0000)]

Eliminate next-alarm-clock broadcast flapping
am: c60da1edc1

Change-Id: Id45dadd7ccebf91435e197f86f5fba71127c0986

commit | commitdiff | tree

Pankaj Kanwar [Mon, 29 Aug 2016 21:50:13 +0000 (21:50 +0000)]

Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev am: d5b8c80b51
am: 30fc10364a

Change-Id: I4aca6a008479094dbc02fc7b71da9037655b40ed

commit | commitdiff | tree

Tyler Gunn [Mon, 29 Aug 2016 21:50:10 +0000 (21:50 +0000)]

Update InCallService#onConnectionEvent comments. am: 06f3fa66b7
am: e3222569c2

Change-Id: I43bfb254bbd730469a6e16a56162b7b5e7b7a1ba

commit | commitdiff | tree

TreeHugger Robot [Mon, 29 Aug 2016 21:47:02 +0000 (21:47 +0000)]

Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev

commit | commitdiff | tree

Pankaj Kanwar [Mon, 29 Aug 2016 21:45:07 +0000 (21:45 +0000)]

Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev
am: d5b8c80b51

Change-Id: I0381077c87e1c42594c4cae902f479c891f56ede

commit | commitdiff | tree

Tyler Gunn [Mon, 29 Aug 2016 21:45:04 +0000 (21:45 +0000)]

Update InCallService#onConnectionEvent comments.
am: 06f3fa66b7

Change-Id: I954dd7bd3079f33e5966a1998c4f676c98cbe0de

commit | commitdiff | tree

Pankaj Kanwar [Mon, 29 Aug 2016 21:37:39 +0000 (21:37 +0000)]

Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 21:33:06 +0000 (21:33 +0000)]

Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am: c8417676ed am: 2f1662f524
am: 6f200e6933

Change-Id: Ie16eea536c6dbb928af0cba8fb6ebec262b611b1

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 21:33:01 +0000 (21:33 +0000)]

DO NOT MERGE -- Fix finishing activity in non-focused stack am: 772c598f66 am: 35c3c8ee8d
am: 6a4d45f796

Change-Id: Idcd0fe8ed0f0b7f8d2965a087161d0084f557f98

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 21:25:08 +0000 (21:25 +0000)]

Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am: c8417676ed
am: 2f1662f524

Change-Id: I09187196f27c75e29de028cc7c344bffb5e0bd86

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 21:25:05 +0000 (21:25 +0000)]

DO NOT MERGE -- Fix finishing activity in non-focused stack am: 772c598f66
am: 35c3c8ee8d

Change-Id: I715699d15b312c5164d87827eb5a29e330f6f4d5

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 21:17:02 +0000 (21:17 +0000)]

Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
am: c8417676ed

Change-Id: I74e1b45ce3eaf9edec6fb60394da3ad8a818d214

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 21:16:59 +0000 (21:16 +0000)]

DO NOT MERGE -- Fix finishing activity in non-focused stack
am: 772c598f66

Change-Id: I890f3b460787682bbe0fdb4d8ce44364f1839dac

commit | commitdiff | tree

TreeHugger Robot [Mon, 29 Aug 2016 21:10:31 +0000 (21:10 +0000)]

Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 29 Aug 2016 19:59:10 +0000 (19:59 +0000)]

Merge "Fix flicker while booting" into nyc-mr1-dev
am: 02405fb349

Change-Id: If348b1c1d1cc80ccda821e219a33b2d9f38233c0

commit | commitdiff | tree

Jorim Jaggi [Mon, 29 Aug 2016 19:59:07 +0000 (19:59 +0000)]

Fix flicker while booting
am: 77cbe79b74

Change-Id: Ib867c34cddaaa2f7877e93d31f8e959ab701859d

commit | commitdiff | tree

Tao Bao [Mon, 29 Aug 2016 19:53:54 +0000 (19:53 +0000)]

Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f am: 18f9533910
am: 40d926f4d4

Change-Id: I9d36d715d049d00a176175cebf02c8a8fed0a7b3

commit | commitdiff | tree

TreeHugger Robot [Mon, 29 Aug 2016 19:51:29 +0000 (19:51 +0000)]

Merge "Fix flicker while booting" into nyc-mr1-dev

commit | commitdiff | tree

Tao Bao [Mon, 29 Aug 2016 19:48:29 +0000 (19:48 +0000)]

Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f
am: 18f9533910

Change-Id: Ia41c67b41b9b89ac113f01e783edcbccae5a1cdc

commit | commitdiff | tree

Christopher Tate [Wed, 3 Aug 2016 21:57:47 +0000 (14:57 -0700)]

Eliminate next-alarm-clock broadcast flapping

When multiple alarm clocks are scheduled at the same time, we would
flap among the alternatives for considering them the 'next upcoming
alarm clock', which in turn would generate [many] spurious broadcasts
about changes to the upcoming alarm situation. This is now fixed;
once we have found the soonest upcoming alarm clock, we stick with
that one until it becomes unavailable, eliminating the spurious
broadcast traffic.

Bug 29501073

Change-Id: Ice1892490bb339e05fa8bd9d324fa1c6718b4942
(cherry picked from commit 76389c00d3d3ce79e48d9e87b597707ed3e8970c)

commit | commitdiff | tree

Tao Bao [Mon, 29 Aug 2016 19:34:23 +0000 (19:34 +0000)]

Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4
am: c5a17fc39f

Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea

commit | commitdiff | tree

Tao Bao [Mon, 29 Aug 2016 19:26:43 +0000 (19:26 +0000)]

Bump up the uncrypt timeout to 30 min.
am: 8abcfed8a4

Change-Id: I35340614fe09f96f8c31cc53a99e366580294490

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 19:05:59 +0000 (19:05 +0000)]

Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am: 128a4419e9 am: 934da4e400
am: 199d4902e2

Change-Id: I3c14b9567284d65dcb4427895fdc18886ad9929e

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 19:01:18 +0000 (19:01 +0000)]

DO NOT MERGE -- Correctly finish activity in non-focused stack am: 620040db3f -s ours am: febd5c027c
am: 8428bfa6e5

Change-Id: I1f0b8af301e19a934c7c2b8e71374e3d89490cd2

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 19:01:16 +0000 (19:01 +0000)]

Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am: 128a4419e9
am: 934da4e400

Change-Id: I9b8c06e89ce182b4fb47a74aaea3d501267add84

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 18:51:55 +0000 (18:51 +0000)]

Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am: 128a4419e9

Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 18:51:53 +0000 (18:51 +0000)]

DO NOT MERGE -- Correctly finish activity in non-focused stack am: 620040db3f -s ours
am: febd5c027c

Change-Id: I658d45b3149128876240e41bbd16ad35951c6dfa

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 18:44:11 +0000 (18:44 +0000)]

DO NOT MERGE -- Correctly finish activity in non-focused stack
am: 620040db3f -s ours

Change-Id: I62703cc7f62bf42967021ce8defa30669e096ec2

commit | commitdiff | tree

Jason Monk [Mon, 29 Aug 2016 18:43:19 +0000 (18:43 +0000)]

Merge "Fix double status bar icons" into nyc-dev am: 2b4e612b10 am: db2d30e1b9
am: 1a5a746fa3

Change-Id: I6c3c1fc27c3f851b27d6036225a8c410b9972517

commit | commitdiff | tree

Jason Monk [Mon, 29 Aug 2016 18:43:17 +0000 (18:43 +0000)]

Fix double status bar icons am: 12124d7eca am: 447991c67a
am: 9570287870

Change-Id: I29d3319ab271e1dd42f7af15f917f97619972cd5

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:43:14 +0000 (18:43 +0000)]

Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: c9c0bcf6a9
am: df8c802677

Change-Id: I3596b2d9182a967896b122c653b5a42c713838aa

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:43:11 +0000 (18:43 +0000)]

Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e
am: ed596e6836

Change-Id: I430e38bcba8b741fe2b43c5dba6f1d2a3f38d5a0

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:43:07 +0000 (18:43 +0000)]

Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: c52edb4f24
am: b35ae808c0

Change-Id: If4057d8e392d19ba62f9365788628922b02d9173

commit | commitdiff | tree

Vineeta Srivastava [Mon, 29 Aug 2016 18:34:03 +0000 (18:34 +0000)]

Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc
am: dd51fb20f3

Change-Id: I1189b69e2b38f36c805198e9dba105df4364f9e8

commit | commitdiff | tree

Vineeta Srivastava [Mon, 29 Aug 2016 18:33:56 +0000 (18:33 +0000)]

whitelist sms code for TMO-DE and TMO-MK. am: 6af315af94
am: f4be3d2927

Change-Id: I75b17dff3fa7b255adb7ce7d705a2d65c1ad5347

commit | commitdiff | tree

Jason Monk [Mon, 29 Aug 2016 18:32:39 +0000 (18:32 +0000)]

Merge "Fix double status bar icons" into nyc-dev am: 2b4e612b10
am: db2d30e1b9

Change-Id: I707e1f8457e826d2d5b83ccc21668e5a786b28eb

commit | commitdiff | tree

Jason Monk [Mon, 29 Aug 2016 18:32:37 +0000 (18:32 +0000)]

Fix double status bar icons am: 12124d7eca
am: 447991c67a

Change-Id: Ic0a217f292dcf4a7d9b2b47c4d32438b436a77ad

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:32:35 +0000 (18:32 +0000)]

Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e
am: c9c0bcf6a9

Change-Id: Ib517c495cd53a5ea0f14bb443b74d69d2efe8429

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:32:33 +0000 (18:32 +0000)]

Fixed a bug where notifications could reappear am: f3b64692a3
am: e90d6d682e

Change-Id: Ie08bd37033cd81ff0898a6766bd505e0f597d7fe

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:32:31 +0000 (18:32 +0000)]

Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0
am: c52edb4f24

Change-Id: I94084878dec7952607572d3005a160cc74eb2a62

commit | commitdiff | tree

Andrii Kulian [Fri, 29 Jul 2016 19:55:41 +0000 (12:55 -0700)]

DO NOT MERGE -- Fix finishing activity in non-focused stack

This CL explicitly checks if we're finishing activity in non-focused
stack as there are other cases except this one when we finish paused
activities in FINISH_AFTER_VISIBLE mode.

Bug: 29007436
Bug: 29458854
Change-Id: I67744d23cd72f2fe8861180008bfdd284a7b5e26
(cherry picked from commit 995fa2bd2d334a37e10760c21ac108f4a3595713)

commit | commitdiff | tree

Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]

Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev

commit | commitdiff | tree

Vineeta Srivastava [Mon, 29 Aug 2016 18:26:02 +0000 (18:26 +0000)]

Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
am: 24b0486cdc

Change-Id: Id291ae046845660231be5b42473ef9b839055035

commit | commitdiff | tree

Jason Monk [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]

Merge "Fix double status bar icons" into nyc-dev
am: 2b4e612b10

Change-Id: Ib0d9e51d289215d96525b68d0432b959e9b58f2f

commit | commitdiff | tree

Vineeta Srivastava [Mon, 29 Aug 2016 18:26:00 +0000 (18:26 +0000)]

whitelist sms code for TMO-DE and TMO-MK.
am: 6af315af94

Change-Id: Ib31807ae28fa798e6d359054d70f9adeaf2872a4

commit | commitdiff | tree

Jason Monk [Mon, 29 Aug 2016 18:25:57 +0000 (18:25 +0000)]

Fix double status bar icons
am: 12124d7eca

Change-Id: Ief00496f19d2e249129023a03cd9f53d76fa7bf8

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:25:54 +0000 (18:25 +0000)]

Merge "Fixed a bug where notifications could reappear" into nyc-dev
am: 4226dcef1e

Change-Id: I7c3c46bf360899387a0d2d33d4beb83a3b096aa0

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:25:51 +0000 (18:25 +0000)]

Fixed a bug where notifications could reappear
am: f3b64692a3

Change-Id: I19719fc6112e82d9600b4196570f571f87291530

commit | commitdiff | tree

Selim Cinek [Mon, 29 Aug 2016 18:25:47 +0000 (18:25 +0000)]

Fixed a bug where the headsup would be stuck disappearing
am: a4155bb7c0

Change-Id: Ic82cbac42cf17427ca5d6675a63d6f914a87f6cb

commit | commitdiff | tree

Vineeta Srivastava [Mon, 29 Aug 2016 18:18:13 +0000 (18:18 +0000)]

Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev

commit | commitdiff | tree

Philip P. Moltmann [Mon, 29 Aug 2016 17:50:58 +0000 (10:50 -0700)]

Size print destination to support font sizing

Fixes: 31152374
Change-Id: I1560d6d300174ec0665157fa4f2c485d64f871ad

commit | commitdiff | tree

Jason Monk [Mon, 29 Aug 2016 18:00:00 +0000 (18:00 +0000)]

Merge "Fix double status bar icons" into nyc-dev

commit | commitdiff | tree

Greg Kaiser [Mon, 29 Aug 2016 17:59:30 +0000 (17:59 +0000)]

Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev
am: 40e6194148

Change-Id: Idcb9f7a4f621f9dc2c66204ef9bd31b9a0649be0

commit | commitdiff | tree

Greg Kaiser [Mon, 29 Aug 2016 17:59:28 +0000 (17:59 +0000)]

ContextHubService: Allow cancelling load/unload
am: 29e868071d

Change-Id: I6c3b5130972907fae1849e596aec8c37ed47e65b

commit | commitdiff | tree

Greg Kaiser [Mon, 29 Aug 2016 17:59:25 +0000 (17:59 +0000)]

Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev
am: 143aaa6d05

Change-Id: I9104870e67e6fe86f294be831575a8c79549fd45

commit | commitdiff | tree

Greg Kaiser [Mon, 29 Aug 2016 17:59:23 +0000 (17:59 +0000)]

ContextHubService: Hack in Google vendor value
am: 5817ce0c13

Change-Id: I168a2a2a50168f7590842b5c51fbc8a80842b00e

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Aug 2016 17:59:21 +0000 (17:59 +0000)]

Merge "Add logging to CursorWindow JNI code to track #31046363" into nyc-mr1-dev
am: 81f876e795

Change-Id: I42aac53add1740ee2253821099da7f9dc45f57d2

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Aug 2016 17:59:19 +0000 (17:59 +0000)]

Add logging to CursorWindow JNI code to track #31046363
am: 0903ec5017

Change-Id: Idde495c1662be20d20a907521ae4e0dbaf5ad88c

commit | commitdiff | tree

Pablo Ceballos [Mon, 29 Aug 2016 17:59:16 +0000 (17:59 +0000)]

Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev
am: 23784fd6d9

Change-Id: Id5eb1742d13fda9ac1d8a1354e4dacd458f2949c

commit | commitdiff | tree

Pablo Ceballos [Mon, 29 Aug 2016 17:59:07 +0000 (17:59 +0000)]

Fail createVirtualDisplay with single-buffered Surface
am: aff2f94939

Change-Id: I5cfcbd0352240d7ac2a9bb0804896cae5396450e

commit | commitdiff | tree

TreeHugger Robot [Mon, 29 Aug 2016 17:58:28 +0000 (17:58 +0000)]

Merge "Fixed a bug where notifications could reappear" into nyc-dev

commit | commitdiff | tree

Greg Kaiser [Mon, 29 Aug 2016 17:48:45 +0000 (17:48 +0000)]

Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev

commit | commitdiff | tree

Greg Kaiser [Mon, 29 Aug 2016 17:43:29 +0000 (17:43 +0000)]

Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help