OSDN Git Service
Makoto Onuki [Sun, 31 Jul 2016 02:25:45 +0000 (02:25 +0000)]
LauncherApps should also throw when user is locked am:
bc4ad85d29 am:
5ec63fc3c7
am:
3b5920b2a1
Change-Id: I60beb409a55297a9a2adaaf52f1ea1e185668c88
Fei Wu [Sun, 31 Jul 2016 02:25:42 +0000 (02:25 +0000)]
Merge \\"Optimize animation of watch switch thumb\\" into cw-f-dev am:
88ee6c8a37
am:
f99a41ac13
Change-Id: I0d66b3dd06fa99583fe608003ad43f70c25903aa
FEI WU [Sun, 31 Jul 2016 02:25:39 +0000 (02:25 +0000)]
Optimize animation of watch switch thumb am:
31f487642e
am:
1b398ab675
Change-Id: I0bc4e6dca4e3f05120b2d98166316908b3c541af
Michael Kwan [Sun, 31 Jul 2016 02:22:59 +0000 (02:22 +0000)]
Merge \\"Update text appearances for watch type device to conform with typography specs.\\" into cw-f-dev am:
46d89fd5af
am:
719b743831
Change-Id: I9b089a0cb4a13ff85ea3a6b1366084d4d7b5cab6
Michael Kwan [Sun, 31 Jul 2016 02:22:57 +0000 (02:22 +0000)]
Update text appearances for watch type device to conform with typography specs. am:
7a446bb3a5
am:
799abc8d6d
Change-Id: Ib6aff3ac60c4eb107a66ae2df0701733115c3131
Adam Powell [Sun, 31 Jul 2016 02:22:53 +0000 (02:22 +0000)]
Merge \\\"Force AlertDialogLayout to have gravity start|top\\\" into nyc-mr1-dev am:
8960c82dcd am:
d35f69d6cd
am:
4808455825
Change-Id: I31aa39fb182fc460b666ff962513dd8858c1208e
Adam Powell [Sun, 31 Jul 2016 02:22:51 +0000 (02:22 +0000)]
Force AlertDialogLayout to have gravity start|top am:
39e0bf23f5 am:
cc8fbd3f29
am:
58d91d51c2
Change-Id: Ic75f5fabdb1194005aaa1fdc9b095a45b81126dc
John Reck [Sun, 31 Jul 2016 02:22:46 +0000 (02:22 +0000)]
Merge \\\"Teach JankTracker about new swap behaviors\\\" into nyc-mr1-dev am:
34921ac110 am:
c452daab03
am:
c05f1ea40b
Change-Id: I41cafb6b921c793277ea0da2c2373d811f9e0998
Hugo Benichi [Sun, 31 Jul 2016 02:13:00 +0000 (02:13 +0000)]
Merge \\\"Fix missing IpConnectivity metrics\\\" into nyc-mr1-dev am:
66e7752ad1 am:
b2db402899
am:
fb5c675b7e
Change-Id: Iba1f81a892acd9f541b9dd564203bfebc56c9c73
Hugo Benichi [Sun, 31 Jul 2016 02:12:55 +0000 (02:12 +0000)]
Fix missing IpConnectivity metrics am:
90cbc5b444 am:
384818b99d
am:
942ad98481
Change-Id: Ia0e8835969c526424a717068f9bf08496694f1c3
Hugo Benichi [Sun, 31 Jul 2016 02:12:51 +0000 (02:12 +0000)]
Merge \\\"IpConnectivityMetrics: no metrics upload in tests\\\" into nyc-mr1-dev am:
1b4bd22f41 am:
6b104bdabf
am:
9ecb72151b
Change-Id: Iaa83e8914614fa874a88beb8821bb83e0dce5c09
Hugo Benichi [Sun, 31 Jul 2016 02:12:47 +0000 (02:12 +0000)]
IpConnectivityMetrics: no metrics upload in tests am:
f9fdf87af2 am:
ae048d8363
am:
36a38bc01b
Change-Id: I751af5bd8060dd9ec7e88a9f8cba3b1c2fae81b2
Winson [Sun, 31 Jul 2016 02:12:44 +0000 (02:12 +0000)]
Defaulting wallpaper offset to edge of the screen. am:
4b4ba90d66 am:
18faeaa5fa
am:
48f732db3a
Change-Id: I86d0616df8f938b1b80651be83802796a24250b9
Dan Willemsen [Sat, 30 Jul 2016 20:02:59 +0000 (13:02 -0700)]
resolve merge conflicts of
74bc31f to master
Change-Id: Ib922ebfb3d91a9c837181a3c652f079cec127f3e
David Friedman [Sat, 30 Jul 2016 06:21:12 +0000 (06:21 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
a211850784 am:
00f85a4794 am:
acbe40ef64 am:
c3ae3d1eb2
am:
21a7b9992f
Change-Id: I45acbc99aa4f772542b75ef6caa45638167b9b25
David Friedman [Sat, 30 Jul 2016 06:21:08 +0000 (06:21 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
a211850784 am:
00f85a4794 am:
3cf674ee3a
am:
d98cfeab73
Change-Id: Iaad320f01c03dd18fe169d86c795120b164fb4e9
Suprabh Shukla [Sat, 30 Jul 2016 06:21:04 +0000 (06:21 +0000)]
Merge \\\"Ensuring KeyguardService has the correct user when it starts\\\" into nyc-mr1-dev am:
81bd8d79cb am:
0a51d0c8cf
am:
2f8e6b3098
Change-Id: I6e3e76459ccfbe3e54518072dfe296d27cec5aff
TreeHugger Robot [Sat, 30 Jul 2016 00:16:56 +0000 (00:16 +0000)]
Merge "resolve merge conflicts of
16dedb7 to master"
Roshan Pius [Fri, 29 Jul 2016 22:58:47 +0000 (22:58 +0000)]
Merge "WifiConfiguration: Expose NetworkSelectionStatus strings"
Suprabh Shukla [Fri, 29 Jul 2016 22:38:49 +0000 (15:38 -0700)]
resolve merge conflicts of
16dedb7 to master
Change-Id: I99024e13f69942f6d687e1f49fe66591c4844d97
TreeHugger Robot [Fri, 29 Jul 2016 20:22:44 +0000 (20:22 +0000)]
Merge "Set secure setting when all preloaded apps are installed"
TreeHugger Robot [Fri, 29 Jul 2016 19:03:42 +0000 (19:03 +0000)]
Merge "Fix build"
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
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
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
FEI WU [Fri, 29 Jul 2016 18:14:19 +0000 (18:14 +0000)]
Optimize animation of watch switch thumb
am:
31f487642e
Change-Id: If94a683d8825daa10faceb7e656db7005c704440
Fei Wu [Fri, 29 Jul 2016 18:08:38 +0000 (18:08 +0000)]
Merge "Optimize animation of watch switch thumb" into cw-f-dev
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
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
TreeHugger Robot [Fri, 29 Jul 2016 18:02:33 +0000 (18:02 +0000)]
Merge "Delete orig DocumentsUI."
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
Colin Cross [Fri, 29 Jul 2016 17:46:58 +0000 (10:46 -0700)]
Fix build
addAppToekn and setAppTask have a new argument.
Change-Id: I8a66863ba4e1cb2991a9f2ae355d0b89e9789f57
Fyodor Kupolov [Thu, 28 Jul 2016 00:45:12 +0000 (17:45 -0700)]
Set secure setting when all preloaded apps are installed
Bug:
30280710
Change-Id: Id87b51c53b1e553a6ab0a257be93baf7d31b6fe5
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
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
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
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
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
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
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
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:58 +0000 (16:54 +0000)]
Merge "Merge \\\\"Docs: fix broken image link in platforms architecture doc\\\\" into nyc-dev am:
eb73a791fd am:
d26ae56f9d am:
7e78990f32 am:
edebec5e15"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:49 +0000 (16:54 +0000)]
Merge "Docs: fix broken image link in platforms architecture doc am:
0ead099a87 am:
911d23165e am:
5c38240a10 am:
b28400fd46"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:38 +0000 (16:54 +0000)]
Merge "Merge \\\"Docs: fix broken image link in platforms architecture doc\\\" into nyc-dev am:
eb73a791fd am:
6aa966b7e6 am:
4578cadf33"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:27 +0000 (16:54 +0000)]
Merge "Docs: fix broken image link in platforms architecture doc am:
0ead099a87 am:
dca5dadaf0 am:
0b14d5f963"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:54:15 +0000 (16:54 +0000)]
Merge "Merge \\\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\\" into nyc-dev am:
e67d1573eb am:
0f42315485 am:
5dc44a59fe am:
2b58870458"
Adarsh Fernando [Fri, 29 Jul 2016 16:53:42 +0000 (16:53 +0000)]
Merge \\\\"Docs: fix broken image link in platforms architecture doc\\\\" into nyc-dev am:
eb73a791fd am:
d26ae56f9d am:
7e78990f32
am:
edebec5e15
Change-Id: I6347e3942af7ede4757f67bc8d10ec88ef058834
Adarsh Fernando [Fri, 29 Jul 2016 16:53:39 +0000 (16:53 +0000)]
Docs: fix broken image link in platforms architecture doc am:
0ead099a87 am:
911d23165e am:
5c38240a10
am:
b28400fd46
Change-Id: I795406b372284e291e726dd1a172fc3e0a137f49
Adarsh Fernando [Fri, 29 Jul 2016 16:53:36 +0000 (16:53 +0000)]
Merge \\\"Docs: fix broken image link in platforms architecture doc\\\" into nyc-dev am:
eb73a791fd am:
6aa966b7e6
am:
4578cadf33
Change-Id: Id1006c84aaa91bd01fe579d1e0ac8fc18f1ed680
Adarsh Fernando [Fri, 29 Jul 2016 16:53:33 +0000 (16:53 +0000)]
Docs: fix broken image link in platforms architecture doc am:
0ead099a87 am:
dca5dadaf0
am:
0b14d5f963
Change-Id: I01e6483f83797a63b8da14478a5ec8e5df9978b6
David Friedman [Fri, 29 Jul 2016 16:53:29 +0000 (16:53 +0000)]
Merge \\\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\\" into nyc-dev am:
e67d1573eb am:
0f42315485 am:
5dc44a59fe
am:
2b58870458
Change-Id: Ic9925a317556476abd2d2e4817257025709fef22
Android Build Merger (Role) [Fri, 29 Jul 2016 16:52:23 +0000 (16:52 +0000)]
Merge "Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
4dd89b6d86 am:
26c2bbca45 am:
507a07dd7b am:
0908a6e41d"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:52:15 +0000 (16:52 +0000)]
Merge "Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc am:
8478151729 am:
aa308c94c9 am:
9a651a43c9 am:
aa2ed314fc"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:52:05 +0000 (16:52 +0000)]
Merge "Merge \\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\" into nyc-dev am:
e67d1573eb am:
609ca92061 am:
13e07be077"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:51:57 +0000 (16:51 +0000)]
Merge "Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
4dd89b6d86 am:
c1f941e10f am:
8aab92c727"
Android Build Merger (Role) [Fri, 29 Jul 2016 16:51:49 +0000 (16:51 +0000)]
Merge "Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc am:
8478151729 am:
68883c7a8a am:
56f481cfa9"
David Friedman [Fri, 29 Jul 2016 16:51:13 +0000 (16:51 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
4dd89b6d86 am:
26c2bbca45 am:
507a07dd7b
am:
0908a6e41d
Change-Id: I85800ca77a43dc28c162499c527e78e8ae61e8e2
Dirk Dougherty [Fri, 29 Jul 2016 16:51:08 +0000 (16:51 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc am:
8478151729 am:
aa308c94c9 am:
9a651a43c9
am:
aa2ed314fc
Change-Id: I34dd933289605a856c5bb767fe0aa1eea78d7b05
David Friedman [Fri, 29 Jul 2016 16:51:04 +0000 (16:51 +0000)]
Merge \\\"Docs: Adds a redirect to allow a shorter URL for NBU page on DAC.\\\" into nyc-dev am:
e67d1573eb am:
609ca92061
am:
13e07be077
Change-Id: Ibf1474f05df2ea2f19b260108d3ac70d7ab56d72
David Friedman [Fri, 29 Jul 2016 16:51:01 +0000 (16:51 +0000)]
Docs: Adds a redirect to allow a shorter URL for NBU page on DAC. am:
4dd89b6d86 am:
c1f941e10f
am:
8aab92c727
Change-Id: I06ad82ac0175deb66e0e45b6ce15b2cce7fe2ae7
Dirk Dougherty [Fri, 29 Jul 2016 16:50:57 +0000 (16:50 +0000)]
Doc change: remove deprecated intl versions of notifications guidelines. am:
223a1727cc am:
8478151729 am:
68883c7a8a
am:
56f481cfa9
Change-Id: I6d34df8a17b71d1e4251800e41f9175dc19db479
Android Build Merger (Role) [Fri, 29 Jul 2016 16:49:16 +0000 (16:49 +0000)]
Merge changes from topic 'am-
814b66751ec643389cdf20694182197c'
* changes:
Merge \\\"Default fingerprint swipe to disabled.\\\" into nyc-mr1-dev am:
781f4386dc am:
f7f4dfea71 am:
69c6ee6331
Default fingerprint swipe to disabled. am:
d01217c0c2 am:
fd8273d53d am:
9bf2c7607e
Android Build Merger (Role) [Fri, 29 Jul 2016 16:49:00 +0000 (16:49 +0000)]
Merge "Merge \\\"update shared libraries for system apps\\\" into nyc-mr1-dev am:
6cecc8dc27 am:
a4bef226cc am:
5398b220b3"
James Carr [Fri, 29 Jul 2016 16:48:54 +0000 (16:48 +0000)]
Merge "Add memory array to the default power_profile.xml"
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
Doris Ling [Fri, 29 Jul 2016 16:45:57 +0000 (16:45 +0000)]
Merge \\\"Default fingerprint swipe to disabled.\\\" into nyc-mr1-dev am:
781f4386dc am:
f7f4dfea71
am:
69c6ee6331
Change-Id: I97069317642d3c63057d8b3807adaa0aa2d28c22
Doris Ling [Fri, 29 Jul 2016 16:45:16 +0000 (16:45 +0000)]
Default fingerprint swipe to disabled. am:
d01217c0c2 am:
fd8273d53d
am:
9bf2c7607e
Change-Id: I78b2e8e451f9ce09f650a46e91a679a9a1b9984d
Todd Kennedy [Fri, 29 Jul 2016 16:45:00 +0000 (16:45 +0000)]
Merge \\\"update shared libraries for system apps\\\" into nyc-mr1-dev am:
6cecc8dc27 am:
a4bef226cc
am:
5398b220b3
Change-Id: I91a575df26583156e0dc450a5d591d65051b3c71
Todd Kennedy [Fri, 29 Jul 2016 16:44:53 +0000 (16:44 +0000)]
update shared libraries for system apps am:
6058df65e6 am:
9815fd3b2e
am:
e4adf5e69a
Change-Id: Ibf7a521a0bc8a3f3a52fcf295e1bed79a12be661
Fyodor Kupolov [Fri, 29 Jul 2016 16:44:43 +0000 (16:44 +0000)]
Merge \\\"Set secure setting when all preloaded apps are installed\\\" into nyc-mr1-dev am:
65e3c7420d am:
649620349b
am:
42bceb7cf6
Change-Id: Icea9aca479191203888b529ebbf681119f2729f5
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
Fyodor Kupolov [Fri, 29 Jul 2016 16:36:30 +0000 (16:36 +0000)]
Set secure setting when all preloaded apps are installed am:
51ce8ee3b1 am:
65d5e75895
am:
892f55e7ad -s ours
Change-Id: I36e05ae35ec1bbca9b5fc9778e111987aaf1e5c0
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
John Reck [Fri, 29 Jul 2016 16:31:38 +0000 (16:31 +0000)]
Teach JankTracker about new swap behaviors
am:
2d5b8d7392
Change-Id: I28afc748f8a43944863bd752c3bd2cb983d19c23
TreeHugger Robot [Fri, 29 Jul 2016 16:25:49 +0000 (16:25 +0000)]
Merge "Teach JankTracker about new swap behaviors" into nyc-mr1-dev
Steve McKay [Thu, 28 Jul 2016 18:10:33 +0000 (11:10 -0700)]
Delete orig DocumentsUI.
Bug:
29224737
Change-Id: I6d6327918adba699d2ed3652bc2dbea27f872284
Makoto Onuki [Fri, 29 Jul 2016 16:12:49 +0000 (16:12 +0000)]
Merge \\\"Relax isUserRunning check and allow in-profile calls\\\" into nyc-mr1-dev am:
82c2e88890 am:
a09d617e05
am:
3f0fbc4e3c
Change-Id: Icd29cd0c07e76ba3ed24cce6dc34f8775cbddd11
Makoto Onuki [Fri, 29 Jul 2016 16:10:23 +0000 (16:10 +0000)]
Relax isUserRunning check and allow in-profile calls am:
8198deacb5 am:
f29793a40c
am:
c6a4953acf
Change-Id: I769cf8827fcc2bfbf952efb33e7529811a373a22
John Reck [Fri, 29 Jul 2016 16:10:19 +0000 (16:10 +0000)]
Merge \\\"Drop less aggressively\\\" into nyc-mr1-dev am:
abf66de147 am:
755d3c319e
am:
2461338a20
Change-Id: I62638af9b675f9cf87ecf2f3f22411fc72c71269
John Reck [Fri, 29 Jul 2016 16:10:15 +0000 (16:10 +0000)]
Drop less aggressively am:
a3d795a34a am:
62ec371a9e
am:
fd6bf88724
Change-Id: I4a6bd075a1989b942c2531048d5d5335a24874f4
Adam Lesinski [Fri, 29 Jul 2016 16:10:11 +0000 (16:10 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
3a45979ab0 am:
9c8423b4bb
am:
df8f53939b
Change-Id: I105ec6b3f36239d8ed9e555e979a7fe489b9ce88
Jorim Jaggi [Fri, 29 Jul 2016 16:10:07 +0000 (16:10 +0000)]
Merge \\\"Follow up for I420bee8a11d430b1e52ded050536e56a85a48800\\\" into nyc-mr1-dev am:
ca5310dd5f am:
77a7fea6eb
am:
ce4f102e53
Change-Id: I304d6f1f7bbb7e91252e05811b784117e44b756f
Jorim Jaggi [Fri, 29 Jul 2016 16:07:35 +0000 (16:07 +0000)]
Follow up for I420bee8a11d430b1e52ded050536e56a85a48800 am:
8d4f5f52a1 am:
ffb289c7b3
am:
f878d518c1
Change-Id: I45a3a50685cceb2c59476a236cb883846ae0f51a
Adam Lesinski [Fri, 29 Jul 2016 16:07:31 +0000 (16:07 +0000)]
Merge \"Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
564a534f33\" into nyc-mr1-dev-plus-aosp
am:
63736dae3e
Change-Id: I7f695c5a3354e6f303a07061d0d4634d70d45d76
Adam Lesinski [Fri, 29 Jul 2016 16:07:27 +0000 (16:07 +0000)]
Fix nesting of sample XML code in complex-resources doc am:
79a5b91d0d am:
d779894510 am:
564a534f33
am:
a84d84f26d
Change-Id: I05e79b916b8258a2bbd5b09fcffe0d11dcb0c86f
Anthony Hugh [Fri, 29 Jul 2016 16:07:18 +0000 (16:07 +0000)]
Merge \\"Update Priority Only defaults on Watch to not include Repeat Callers\\" into cw-f-dev am:
513d3e7073
am:
47cb7c2482
Change-Id: Ic6e058cc0fab197e60ef16496fc7bab7784d8227
Anthony Hugh [Fri, 29 Jul 2016 16:06:46 +0000 (16:06 +0000)]
Update Priority Only defaults on Watch to not include Repeat Callers am:
c04e68f0a5
am:
29bcc1067b
Change-Id: Ideb92773647a0518d637acb6f5142dc0b324b556
Adam Lesinski [Fri, 29 Jul 2016 16:06:41 +0000 (16:06 +0000)]
Merge \\\"DO NOT MERGE Change KernelUidCpuTimeReader Slog.wtf to Slog.e\\\" into nyc-mr1-dev am:
533159b4f9 am:
e65da1061f
am:
297267f4f9 -s ours
Change-Id: Ic0bd531bdabb25fc2501753ac401c201aec4f97b
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
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
TreeHugger Robot [Fri, 29 Jul 2016 13:35:17 +0000 (13:35 +0000)]
Merge "fix javadoc for grantRuntimePermission"
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
Hugo Benichi [Fri, 29 Jul 2016 09:47:21 +0000 (09:47 +0000)]
Fix missing IpConnectivity metrics am:
90cbc5b444
am:
384818b99d
Change-Id: I62f174cc615f40e450ba72f8c6f86d46ed5fc096
Hugo Benichi [Fri, 29 Jul 2016 09:42:15 +0000 (09:42 +0000)]
Merge \"Fix missing IpConnectivity metrics\" into nyc-mr1-dev
am:
66e7752ad1
Change-Id: If41836cf7f4a92d5c2cc385b8a204153be1c18d0
Hugo Benichi [Fri, 29 Jul 2016 09:42:13 +0000 (09:42 +0000)]
Fix missing IpConnectivity metrics
am:
90cbc5b444
Change-Id: I636a187e94428f6974a3dc4e9588ea95f3293da8
TreeHugger Robot [Fri, 29 Jul 2016 09:38:26 +0000 (09:38 +0000)]
Merge "Fix missing IpConnectivity metrics" into nyc-mr1-dev
Hugo Benichi [Fri, 29 Jul 2016 09:34:43 +0000 (09:34 +0000)]
Merge \\"IpConnectivityMetrics: no metrics upload in tests\\" into nyc-mr1-dev am:
1b4bd22f41
am:
6b104bdabf
Change-Id: Id587c460e906fe629eb64b39b4c18f902738d6d6
Hugo Benichi [Fri, 29 Jul 2016 09:34:35 +0000 (09:34 +0000)]
IpConnectivityMetrics: no metrics upload in tests am:
f9fdf87af2
am:
ae048d8363
Change-Id: I4171f72e27f39f2c10e4607b84934676337c1b4e
Hugo Benichi [Fri, 29 Jul 2016 09:28:19 +0000 (09:28 +0000)]
Merge \"IpConnectivityMetrics: no metrics upload in tests\" into nyc-mr1-dev
am:
1b4bd22f41
Change-Id: Ie313d530bcb5afd4e5ad9a6cf66c501b9029cbea
Hugo Benichi [Fri, 29 Jul 2016 09:28:17 +0000 (09:28 +0000)]
IpConnectivityMetrics: no metrics upload in tests
am:
f9fdf87af2
Change-Id: I3a7c39ccb185d1c10efcb1ddbfd2cddf7393b0a4
TreeHugger Robot [Fri, 29 Jul 2016 09:23:27 +0000 (09:23 +0000)]
Merge "IpConnectivityMetrics: no metrics upload in tests" into nyc-mr1-dev
OSDN Git Service
