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

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

Android Build Merger (Role) [Fri, 29 Jul 2016 21:10:08 +0000 (21:10 +0000)]

Merge "Merge \\\"docs: fix escaped characters in data binding doc\\\" into nyc-docs am: 4172905146 am: 06c1159b0a am: e6e257f46e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 21:09:54 +0000 (21:09 +0000)]

Merge "docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde am: ee15ca4437" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:09:31 +0000 (21:09 +0000)]

Merge \\\"docs: fix escaped characters in data binding doc\\\" into nyc-docs am: 4172905146 am: 06c1159b0a
am: e6e257f46e

Change-Id: If9975539229a2036463e61532dc46501777c989f

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:09:29 +0000 (21:09 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80 am: 494d775cde
am: ee15ca4437

Change-Id: I2e9a6c2344640198d4ef15401d33b044e790ac39

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 21:09:28 +0000 (21:09 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9 am: 54dd962416
am: 56ff60b465

Change-Id: Ib7c106e06806bc45acdf0594c53ccac41e3d9682

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 21:03:08 +0000 (21:03 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9
am: 878abb9bf4

Change-Id: I5a1a62cf09097f2ba1e2be449d3cebd3e7464895

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:03:02 +0000 (21:03 +0000)]

Merge \\"docs: fix escaped characters in data binding doc\\" into nyc-docs am: 4172905146
am: 06c1159b0a

Change-Id: I1fff6816d546f43f0da72cef2fccba445c817b3e

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 21:03:01 +0000 (21:03 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours am: 53e9affbf9
am: 54dd962416

Change-Id: I86796c357914dbb85cf51cb94ce3f705685aec52

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 21:02:58 +0000 (21:02 +0000)]

docs: fix escaped characters in data binding doc am: 011c07bd80
am: 494d775cde

Change-Id: If30c7493e1a24fd3a1417eea9f9bc647cc31abce

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:55:43 +0000 (20:55 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours
am: 53e9affbf9

Change-Id: Ic185caf8064a4077fafb5046e7b4a15de2d0122b

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:55:07 +0000 (20:55 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8 am: 49f14fa7e0 -s ours
am: 53e9affbf9

Change-Id: I1e597db421eb342f723f15f72d7297ba4daada13

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 20:54:47 +0000 (20:54 +0000)]

Merge \"docs: fix escaped characters in data binding doc\" into nyc-docs
am: 4172905146

Change-Id: I89e1aeade45c0faf78f569eda75a98f1cf81b773

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 20:54:45 +0000 (20:54 +0000)]

docs: fix escaped characters in data binding doc
am: 011c07bd80

Change-Id: I319973e92d7e3687c240b71783add9c74af478ce

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:47:35 +0000 (20:47 +0000)]

Merge \\"Cache package names after reboot\\" into nyc-mr1-dev am: 77faae7282
am: 2c633e9b83

Change-Id: I04eb4420e995c90a6504c59fc603077993c5ed47

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:47:32 +0000 (20:47 +0000)]

Cache package names after reboot am: 773e997432
am: 94387b55c9

Change-Id: I5de79b71a2f170b4635bdf6406854d2685c9efc9

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:47:27 +0000 (20:47 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011 am: f3af9e5825
am: 6bcbe9a7aa

Change-Id: Ib8e9fa7d02bad93b9b89d97a470ae5f7fedd5794

commit | commitdiff | tree

Mark Lu [Fri, 29 Jul 2016 20:41:08 +0000 (20:41 +0000)]

Merge "docs: fix escaped characters in data binding doc" into nyc-docs

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:38:14 +0000 (20:38 +0000)]

Merge \"Cache package names after reboot\" into nyc-mr1-dev
am: 77faae7282

Change-Id: Iff7c30a60d38feb2ce5fa5e4412f6fcbf4cd6bdf

commit | commitdiff | tree

Fyodor Kupolov [Fri, 29 Jul 2016 20:38:11 +0000 (20:38 +0000)]

Cache package names after reboot
am: 773e997432

Change-Id: I556f33c4664d37de4a64ffb26b99f7a083edf15b

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:38:05 +0000 (20:38 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011
am: f3af9e5825

Change-Id: I5d6b7e28d15b8994a108ff3bc72c5c3f99d24e3d

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:37:47 +0000 (20:37 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0 am: 59cb7ab7b8
am: 49f14fa7e0 -s ours

Change-Id: I2e6b505b24592dbcbc23e4d8c4025ad9972b73ad

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Jul 2016 20:23:43 +0000 (20:23 +0000)]

Merge "Cache package names after reboot" into nyc-mr1-dev

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:20:38 +0000 (20:20 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours am: cd17df0011
am: ccad5a8f22

Change-Id: Ib8097e14464f636444598ad9f42fb58f117d20ce

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:10:28 +0000 (20:10 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8 am: bfdf9592d0
am: 59cb7ab7b8

Change-Id: I166f91e72d1da65610d0f7d697dd70ddb9cfe96a

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:07:33 +0000 (20:07 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035 am: d056456fe2 -s ours
am: cd17df0011

Change-Id: I527e41199d4a828ec9b77ead8de99c2496022c29

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 20:03:48 +0000 (20:03 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 19:56:30 +0000 (19:56 +0000)]

Merge "DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc am: 58cf51abb7 am: 41d65fc3b8" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 19:56:17 +0000 (19:56 +0000)]

Merge "Merge \\"Handle reset of recommended services\\" into nyc-mr1-dev am: 0922e6c652 am: 76ce382352" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 29 Jul 2016 19:56:06 +0000 (19:56 +0000)]

Merge "Handle reset of recommended services am: fe789f3189 am: bc11f26a09" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:55:25 +0000 (19:55 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc am: 58cf51abb7
am: 41d65fc3b8

Change-Id: I8d1bf771a86325745f58345b2bb6dfd7165187fa

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:55:22 +0000 (19:55 +0000)]

Merge \\"Handle reset of recommended services\\" into nyc-mr1-dev am: 0922e6c652
am: 76ce382352

Change-Id: I8dd7604b8b0b82ca6e20da0b94f9fdd65ff053c1

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:55:18 +0000 (19:55 +0000)]

Handle reset of recommended services am: fe789f3189
am: bc11f26a09

Change-Id: Id23a5eac08cfa6ce88205cb826c6d2fc6eb4b3fe

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:54:42 +0000 (19:54 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b am: dd2ec80035
am: d056456fe2 -s ours

Change-Id: Ifb5115f0efac94fbbbb622d442bd32c49df085f5

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:54:33 +0000 (19:54 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc
am: 4d90202dd3

Change-Id: I8a8946386ac17b49794bcfe10d2bdc6ff99068f4

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:52:34 +0000 (19:52 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours am: e0316fc7a8
am: bfdf9592d0

Change-Id: I2ceb67ac584b8fe681ffcb812ebff2f8d7ae721e

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:48:00 +0000 (19:48 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e am: b8d3dd2472 -s ours
am: e0316fc7a8

Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:47:51 +0000 (19:47 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours
am: 204fdc49fc

Change-Id: I923456f924901516f86504ba25699ae38d1c205c

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:46:13 +0000 (19:46 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60 am: 25782fae9b
am: dd2ec80035

Change-Id: I27b22faf8d6ad4bba039a1eca699bd4163c2ad6a

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:46:08 +0000 (19:46 +0000)]

Merge \\"Increased size of data_saver_enable_title.\\" into nyc-mr1-dev am: c6655be308
am: af24aba45c

Change-Id: Ibfb67a68ce1b512eb6af948f99ebd4bc24ac1cca

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:46:04 +0000 (19:46 +0000)]

Increased size of data_saver_enable_title. am: 9b0e888ff9
am: ecf5a195d7

Change-Id: I68c948b34c4af8f16c261899ce628d08400aa193

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:46:00 +0000 (19:46 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours am: 204fdc49fc
am: 58cf51abb7

Change-Id: I3fa641028ec04ad26676b85dd5aff689805ba1f7

commit | commitdiff | tree

Phil Weaver [Fri, 29 Jul 2016 19:45:58 +0000 (19:45 +0000)]

Merge \\"Prevent a11y seeing behind tasks w/modal windows.\\" into nyc-mr1-dev am: a200e774e7
am: cf2477ddb4

Change-Id: I1e5348dcf2bef2e9e75a31da6dd214b1211e444e

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:45:57 +0000 (19:45 +0000)]

Merge \"Handle reset of recommended services\" into nyc-mr1-dev
am: 0922e6c652

Change-Id: I9a1ee585ca0b3494240dbb81757922b6d82a9ad9

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:45:53 +0000 (19:45 +0000)]

Handle reset of recommended services
am: fe789f3189

Change-Id: I66aeb50ca22b06d04c280c3a64ecb62481ca78e6

commit | commitdiff | tree

Phil Weaver [Fri, 29 Jul 2016 19:45:53 +0000 (19:45 +0000)]

Prevent a11y seeing behind tasks w/modal windows. am: ac9ad70086
am: 7fb5fcc3a6

Change-Id: I800fe6269862dd3bcb9593a73078bad8bba514ae

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:37:10 +0000 (19:37 +0000)]

Merge \"Increased size of data_saver_enable_title.\" into nyc-mr1-dev
am: c6655be308

Change-Id: Ie05a740d400ebc0fe6ea5ad8d9552fc9bea57737

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 19:37:08 +0000 (19:37 +0000)]

Increased size of data_saver_enable_title.
am: 9b0e888ff9

Change-Id: I5aec6f21240d9996a35dbbd634cf7434011de8b7

commit | commitdiff | tree

Phil Weaver [Fri, 29 Jul 2016 19:37:04 +0000 (19:37 +0000)]

Merge \"Prevent a11y seeing behind tasks w/modal windows.\" into nyc-mr1-dev
am: a200e774e7

Change-Id: I3a7c35a3271b1480d890eeb0edfbabc96302cfc0

commit | commitdiff | tree

Phil Weaver [Fri, 29 Jul 2016 19:37:01 +0000 (19:37 +0000)]

Prevent a11y seeing behind tasks w/modal windows.
am: ac9ad70086

Change-Id: I2dd1fa528c657683b99d93effdc5d6338b689bac

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:36:45 +0000 (19:36 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935 am: e71159c5f7 -s ours
am: 204fdc49fc

Change-Id: I2e62b62badbb0c528295190cd403ce252c4afe10

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:35:54 +0000 (19:35 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a am: b6a3e8ce8e
am: b8d3dd2472 -s ours

Change-Id: I3875a28849df618a392a88480271bf1ac8ef776e

commit | commitdiff | tree

Philip P. Moltmann [Fri, 29 Jul 2016 19:30:49 +0000 (19:30 +0000)]

Merge "Handle reset of recommended services" into nyc-mr1-dev

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:24:37 +0000 (19:24 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours am: 0bbdc37b60
am: 25782fae9b

Change-Id: I9fe008924b75ac7d348e0aa8c478f859a4ed743b

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Jul 2016 19:22:48 +0000 (19:22 +0000)]

Merge "Increased size of data_saver_enable_title." into nyc-mr1-dev

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:21:41 +0000 (19:21 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522 am: b04c428935
am: e71159c5f7 -s ours

Change-Id: I0b07f82bf5df950dd03ff93d863033ea23510186

commit | commitdiff | tree

Phil Weaver [Fri, 29 Jul 2016 19:16:37 +0000 (19:16 +0000)]

Merge "Prevent a11y seeing behind tasks w/modal windows." into nyc-mr1-dev

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:14:02 +0000 (19:14 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours am: 2dbb64594a
am: b6a3e8ce8e

Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:03:14 +0000 (19:03 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours am: 6489d870d7 -s ours
am: 2dbb64594a

Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:02:55 +0000 (19:02 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8 am: 2df9864b54 -s ours
am: 0bbdc37b60

Change-Id: If4f25ea9d5a921fb264d67137fc0af05d84e614e

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 19:02:43 +0000 (19:02 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522
am: b04c428935

Change-Id: I5781e7822d050426288bbd42faafff31f098aa99

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:56:25 +0000 (18:56 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99 am: 14abf736c8
am: 2df9864b54 -s ours

Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:56:07 +0000 (18:56 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171 am: f645010092 -s ours
am: 6489d870d7 -s ours

Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053

commit | commitdiff | tree

Michael Kwan [Fri, 29 Jul 2016 18:50:34 +0000 (18:50 +0000)]

Merge \"Resolve issues with AlertDialog layout for watch devices.\" into cw-f-dev
am: 03da42c94d

Change-Id: Id7b2e99bbd64a9ded7db34de41012d6bc24242cd

commit | commitdiff | tree

Michael Kwan [Fri, 29 Jul 2016 18:50:30 +0000 (18:50 +0000)]

Resolve issues with AlertDialog layout for watch devices.
am: 44ff1e1d13

Change-Id: I4ac042e6f4eb982e60a3de12c781a0457a59ad5b

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:50:29 +0000 (18:50 +0000)]

DO NOT MERGE: Fix CTS regression am: 90be39c7bb
am: db9f504522

Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:50:25 +0000 (18:50 +0000)]

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99
am: 14abf736c8

Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:45:45 +0000 (18:45 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171
am: f645010092 -s ours

Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368

commit | commitdiff | tree

Michael Kwan [Fri, 29 Jul 2016 18:44:59 +0000 (18:44 +0000)]

Merge "Resolve issues with AlertDialog layout for watch devices." into cw-f-dev

commit | commitdiff | tree

Makoto Onuki [Fri, 29 Jul 2016 18:38:16 +0000 (18:38 +0000)]

Merge \\"LauncherApps should also throw when user is locked\\" into nyc-mr1-dev am: ba933b39ae
am: 5e9d23dbd6

Change-Id: I99d953bc77ac644fbb7e38bd6cccc285f497cd12

commit | commitdiff | tree

Makoto Onuki [Fri, 29 Jul 2016 18:38:12 +0000 (18:38 +0000)]

LauncherApps should also throw when user is locked am: bc4ad85d29
am: 5ec63fc3c7

Change-Id: Iacb1a0725553ff8e2c205eba8e74d26b19a9a5dd

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:38:07 +0000 (18:38 +0000)]

DO NOT MERGE: Fix CTS regression
am: 7a92dc9d99

Change-Id: I13605f366810c158d380b11a814da8eac3e4e213

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:38:06 +0000 (18:38 +0000)]

DO NOT MERGE: Fix CTS regression am: df17644db7
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:32:49 +0000 (18:32 +0000)]

DO NOT MERGE: Fix CTS regression
am: 90be39c7bb

Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:31:07 +0000 (18:31 +0000)]

DO NOT MERGE: Fix CTS regression
am: df17644db7

Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22

commit | commitdiff | tree

Makoto Onuki [Fri, 29 Jul 2016 18:21:58 +0000 (18:21 +0000)]

Merge \"LauncherApps should also throw when user is locked\" into nyc-mr1-dev
am: ba933b39ae

Change-Id: I56ac80b37f012bd7453428d17d95d63c16215296

commit | commitdiff | tree

Makoto Onuki [Fri, 29 Jul 2016 18:21:53 +0000 (18:21 +0000)]

LauncherApps should also throw when user is locked
am: bc4ad85d29

Change-Id: Ic7bc111861634f2a38cd262a93f56976924c64ba

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Jul 2016 18:15:35 +0000 (18:15 +0000)]

Merge "LauncherApps should also throw when user is locked" into nyc-mr1-dev

commit | commitdiff | tree

FEI WU [Fri, 29 Jul 2016 18:14:27 +0000 (18:14 +0000)]

Merge \"Optimize animation of watch switch thumb\" into cw-f-dev
am: 88ee6c8a37

Change-Id: I73bab5b03719140dfc791c3677d93753a0bd2441

commit | commitdiff | tree

FEI WU [Fri, 29 Jul 2016 18:14:19 +0000 (18:14 +0000)]

Optimize animation of watch switch thumb
am: 31f487642e

Change-Id: If94a683d8825daa10faceb7e656db7005c704440

commit | commitdiff | tree

Fei Wu [Fri, 29 Jul 2016 18:08:38 +0000 (18:08 +0000)]

Merge "Optimize animation of watch switch thumb" into cw-f-dev

commit | commitdiff | tree

Michael Kwan [Fri, 29 Jul 2016 18:04:44 +0000 (18:04 +0000)]

Merge \"Update text appearances for watch type device to conform with typography specs.\" into cw-f-dev
am: 46d89fd5af

Change-Id: Ie570cf166d8eb6ae95ff6c95ae9526ff86f8ac35

commit | commitdiff | tree

Michael Kwan [Fri, 29 Jul 2016 18:04:37 +0000 (18:04 +0000)]

Update text appearances for watch type device to conform with typography specs.
am: 7a446bb3a5

Change-Id: Ie21b5f9fb243a70bf1ae2c7b18f19479311a0e68

commit | commitdiff | tree

Michael Kwan [Fri, 29 Jul 2016 17:55:19 +0000 (17:55 +0000)]

Merge "Update text appearances for watch type device to conform with typography specs." into cw-f-dev

commit | commitdiff | tree

Adam Powell [Fri, 29 Jul 2016 17:18:35 +0000 (17:18 +0000)]

Merge \\"Force AlertDialogLayout to have gravity start|top\\" into nyc-mr1-dev am: 8960c82dcd
am: d35f69d6cd

Change-Id: I90de8bed4bfcae51837b135cc44d2c3e7ad94de4

commit | commitdiff | tree

Adam Powell [Fri, 29 Jul 2016 17:18:31 +0000 (17:18 +0000)]

Force AlertDialogLayout to have gravity start|top am: 39e0bf23f5
am: cc8fbd3f29

Change-Id: I455fcf33ad8fa98a6c31e9b9ade4973b446fdeac

commit | commitdiff | tree

John Reck [Fri, 29 Jul 2016 17:18:27 +0000 (17:18 +0000)]

Merge \\"Teach JankTracker about new swap behaviors\\" into nyc-mr1-dev am: 34921ac110
am: c452daab03

Change-Id: I587e468cddc87df9449076a8eb34e7b237e211b3

commit | commitdiff | tree

John Reck [Fri, 29 Jul 2016 17:08:16 +0000 (10:08 -0700)]

resolve merge conflicts of 67daab6 to nyc-mr1-dev-plus-aosp

Change-Id: I35f867b8d6408a7eae9cf5643f0908259de90cb1

commit | commitdiff | tree

Adam Powell [Fri, 29 Jul 2016 17:02:27 +0000 (17:02 +0000)]

Merge \"Force AlertDialogLayout to have gravity start|top\" into nyc-mr1-dev
am: 8960c82dcd

Change-Id: Ice3839d2e031f1d3ed7cb5d51adac898e0926dda

commit | commitdiff | tree

Adam Powell [Fri, 29 Jul 2016 17:02:25 +0000 (17:02 +0000)]

Force AlertDialogLayout to have gravity start|top
am: 39e0bf23f5

Change-Id: I93da3a31cf2c09232967e1e26949d115a144b1b3

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Jul 2016 16:56:24 +0000 (16:56 +0000)]

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

commit | commitdiff | tree

FEI WU [Fri, 29 Jul 2016 16:48:42 +0000 (09:48 -0700)]

Optimize animation of watch switch thumb

The anim of watch switch thumb was designed to be 180 ms. Adjust it to
250 ms to be in consistent with the animation of thumb motion, i.e.
Switch.THUMB_ANIMATION_DURATION.

Change-Id: I3a8c3eb5dc02340be754a6e05cb823bf122286c1

commit | commitdiff | tree

Makoto Onuki [Fri, 29 Jul 2016 16:40:40 +0000 (09:40 -0700)]

LauncherApps should also throw when user is locked

otherwise it'd be racy.

Bug 30406401

Change-Id: Id6b0295933c5639fa23c56d737a7f0199cbd7497

commit | commitdiff | tree

John Reck [Fri, 29 Jul 2016 16:31:58 +0000 (16:31 +0000)]

Merge \"Teach JankTracker about new swap behaviors\" into nyc-mr1-dev
am: 34921ac110

Change-Id: I11d8ed2216f8f8b0cce444508cc76253570e61f7

commit | commitdiff | tree

John Reck [Fri, 29 Jul 2016 16:31:38 +0000 (16:31 +0000)]

Teach JankTracker about new swap behaviors
am: 2d5b8d7392

Change-Id: I28afc748f8a43944863bd752c3bd2cb983d19c23

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Jul 2016 16:25:49 +0000 (16:25 +0000)]

Merge "Teach JankTracker about new swap behaviors" into nyc-mr1-dev

commit | commitdiff | tree

Felipe Leme [Fri, 29 Jul 2016 16:17:38 +0000 (09:17 -0700)]

Increased size of data_saver_enable_title.

Change-Id: I01b3675533d2d88ce7412b208d558057ff679919
Fixes: 28366097

commit | commitdiff | tree

Adam Powell [Thu, 28 Jul 2016 23:30:10 +0000 (16:30 -0700)]

Force AlertDialogLayout to have gravity start|top

AlertDialogLayout overrides LinearLayout#onMeasure but not onLayout,
meaning that some state initialized for the handling of gravity may
not be valid in LinearLayout#onLayout. As this is an internal class
never used directly by apps, explicitly specify the default gravity of
start|top in @layout/alert_dialog_material to avoid this bug. Apps
that do things like set gravity in their theme (for whatever reason)
could otherwise change its behavior.

Bug 30494039

Change-Id: I71a8be1829a7fe24cf7714a3bd5ed732f85eb887

commit | commitdiff | tree

John Reck [Thu, 28 Jul 2016 22:36:11 +0000 (15:36 -0700)]

Teach JankTracker about new swap behaviors

Bug: 30440166

If we are using HWC2, there's a change in timing
when in triple buffering with the pipelined offsets.
This changes JankTracker to recognize that and silently
erase that from the total duration

Change-Id: Ib1fd4209070f17dbd2baed707c8cf73fb11c3cf2

commit | commitdiff | tree

Hugo Benichi [Fri, 29 Jul 2016 09:47:25 +0000 (09:47 +0000)]

Merge \\"Fix missing IpConnectivity metrics\\" into nyc-mr1-dev am: 66e7752ad1
am: b2db402899

Change-Id: I4bde99c78876b7a877f55ccfb1d62645dd0a595d

commit | commitdiff | tree

Hugo Benichi [Fri, 29 Jul 2016 09:47:21 +0000 (09:47 +0000)]

Fix missing IpConnectivity metrics am: 90cbc5b444
am: 384818b99d

Change-Id: I62f174cc615f40e450ba72f8c6f86d46ed5fc096

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help