OSDN Git Service
Xin Li [Wed, 9 Nov 2016 20:35:03 +0000 (20:35 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630 am:
1a06ebfcac
am:
781d8f7426
Change-Id: I2c144951b08fda465e0ee4ad4ba50f9ebe247a1c
Xin Li [Wed, 9 Nov 2016 20:34:01 +0000 (20:34 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours am:
b9634f3081
am:
9dccfbc7c8
Change-Id: Ib02f82fa385a514d339331fc3f3b5309a8042fa5
Xin Li [Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630
am:
1a06ebfcac
Change-Id: I062b547da4a7190f27de0979b9859d4ce4307b00
Xin Li [Wed, 9 Nov 2016 20:23:02 +0000 (20:23 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours
am:
b9634f3081
Change-Id: Icd07d2224a1b58800f7344ff3b7928b335904446
Xin Li [Wed, 9 Nov 2016 20:11:43 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
am:
49b144e630
Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f
Xin Li [Wed, 9 Nov 2016 20:11:38 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.
am:
9b9906e9c0 -s ours
Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c
Damien Bargiacchi [Wed, 9 Nov 2016 19:05:34 +0000 (19:05 +0000)]
Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev
TreeHugger Robot [Wed, 9 Nov 2016 02:26:14 +0000 (02:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 9 Nov 2016 01:24:36 +0000 (17:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32363164
Change-Id: I8b2e02fa6ddcf65e7bd9f413e9d31022b60b57a5
Xin Li [Tue, 8 Nov 2016 21:24:55 +0000 (21:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
Bill Yi [Tue, 8 Nov 2016 12:02:48 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
197da1f978 -s ours
Change-Id: Ia680464b0a45ab4ec9be1521adf5d31063622cae
Bill Yi [Tue, 8 Nov 2016 12:02:47 +0000 (12:02 +0000)]
Import translations. DO NOT MERGE
am:
7821bbd9a5 -s ours
Change-Id: I026f6272bc57f0a16d87cb578668aeecea44c772
TreeHugger Robot [Tue, 8 Nov 2016 11:56:59 +0000 (11:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Tue, 8 Nov 2016 11:53:17 +0000 (11:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 8 Nov 2016 10:03:00 +0000 (02:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1caa69921dbde7442c433f3373f17a442d1b48b3
Auto-generated-cl: translation import
Bill Yi [Tue, 8 Nov 2016 04:59:23 +0000 (20:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd8a71ffdf6db4fcfa0a001ffded8b51a729b10d
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 8 Nov 2016 03:21:10 +0000 (03:21 +0000)]
Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev
Jeff Sharkey [Tue, 8 Nov 2016 01:02:12 +0000 (01:02 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8 am:
a61e5fb9f6 am:
e9cd3aea19
am:
557389d96b
Change-Id: I587ecb5f31246677c6e57814cb744ef2bb38572b
Jeff Sharkey [Tue, 8 Nov 2016 00:55:36 +0000 (00:55 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390 am:
babd7e06d3 am:
8554f2d934 am:
acdcb74361
am:
4ef12b0404
Change-Id: Ie986c43f72b3bc9140f23df71845fb2c0978c29e
Jeff Sharkey [Tue, 8 Nov 2016 00:53:15 +0000 (00:53 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c am:
8e803f734a am:
874a7af9f7 am:
aaeb6286fe
am:
4448f11e8a
Change-Id: Ic5676d9bed87fa5777eee1ce578b6402d4274645
Jeff Sharkey [Tue, 8 Nov 2016 00:49:41 +0000 (00:49 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8 am:
a61e5fb9f6
am:
e9cd3aea19
Change-Id: I3b61d8fa4e3ad2ba0ba99e6918ace3a5871e128e
Jeff Sharkey [Tue, 8 Nov 2016 00:47:56 +0000 (00:47 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390 am:
babd7e06d3 am:
8554f2d934
am:
acdcb74361
Change-Id: I78abfa2adb14c2065117be41568d0fba90a277f7
Jeff Sharkey [Tue, 8 Nov 2016 00:42:43 +0000 (00:42 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c am:
8e803f734a am:
874a7af9f7
am:
aaeb6286fe
Change-Id: I33a40f027ecbd233f7e8cafd61f50479ff565dd8
Jeff Sharkey [Tue, 8 Nov 2016 00:42:42 +0000 (00:42 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433 am:
84ef9e69fc am:
e4419f474e am:
d93ed63baa
am:
a27ca045e5
Change-Id: Ie91c35c5b148e8d51dc54c398ce019e4f2046a31
Jeff Sharkey [Tue, 8 Nov 2016 00:35:26 +0000 (00:35 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433 am:
84ef9e69fc am:
e4419f474e
am:
d93ed63baa
Change-Id: I1d2a9bd0af847b8316720651bc2192151f999bcd
Jeff Sharkey [Tue, 8 Nov 2016 00:33:50 +0000 (00:33 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8
am:
a61e5fb9f6
Change-Id: I3716aa9bfc3816e9a0159560daf755fcf89904f1
Jeff Sharkey [Tue, 8 Nov 2016 00:32:05 +0000 (00:32 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390 am:
babd7e06d3
am:
8554f2d934
Change-Id: I81c9598e3434fe44f1324a4115a9eda39047070d
Jeff Sharkey [Tue, 8 Nov 2016 00:31:42 +0000 (00:31 +0000)]
Public volumes belong to a single user. am:
def2123f56 -s ours am:
de221f06a3 am:
9854b1707c
am:
5cae493d1b
Change-Id: I1a16cfda1a9513824f98def5a257da4abe2dc758
Jeff Sharkey [Tue, 8 Nov 2016 00:29:22 +0000 (00:29 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c am:
8e803f734a
am:
874a7af9f7
Change-Id: Ia13bf45bfb0ac5057a2a8899b0bd543c238d7d3e
Jeff Sharkey [Tue, 8 Nov 2016 00:25:31 +0000 (00:25 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433 am:
84ef9e69fc
am:
e4419f474e
Change-Id: Ic7ac4b928536fb5d7b18957d35e2ca1aea832fed
Jeff Sharkey [Tue, 8 Nov 2016 00:19:39 +0000 (00:19 +0000)]
Public volumes belong to a single user. am:
def2123f56 -s ours am:
de221f06a3
am:
9854b1707c
Change-Id: I35e050710d0af31631ac2b0f823ed2fcabf174e2
Jeff Sharkey [Tue, 8 Nov 2016 00:17:51 +0000 (00:17 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995
am:
09e10e54f8
Change-Id: I1bb3bc5f0db563797262a8e4485f4ede25db4c99
Jeff Sharkey [Tue, 8 Nov 2016 00:16:13 +0000 (00:16 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390
am:
babd7e06d3
Change-Id: Ib810882924443e195b31d505f8d1657914c6edfe
Jeff Sharkey [Tue, 8 Nov 2016 00:13:51 +0000 (00:13 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c
am:
8e803f734a
Change-Id: I80f21d5df3b37c27a9c56c1412ae942b88264349
Jeff Sharkey [Tue, 8 Nov 2016 00:10:32 +0000 (00:10 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433
am:
84ef9e69fc
Change-Id: Icf8d31fa28b1223d3f789ff653bbecfbcf87bcfb
Jeff Sharkey [Tue, 8 Nov 2016 00:09:41 +0000 (00:09 +0000)]
Public volumes belong to a single user. am:
def2123f56 -s ours
am:
de221f06a3
Change-Id: I73f0c785931688020dcdc5bd16f54449f0bf6f51
Jeff Sharkey [Tue, 8 Nov 2016 00:04:28 +0000 (00:04 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61
am:
0a23c1a995
Change-Id: Ib501fa0ed255de6ac64aae58ad12eaec4889d46e
Jeff Sharkey [Tue, 8 Nov 2016 00:03:04 +0000 (00:03 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc
am:
dc89fb9390
Change-Id: I2b4587edb6ae1a7c4c0eb4532a7af36143c20da5
Jeff Sharkey [Tue, 8 Nov 2016 00:01:30 +0000 (00:01 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab
am:
7738ebcd5c
Change-Id: Ib812b973ddb26098f10bd88a7ec19573bdf900c0
Jeff Sharkey [Mon, 7 Nov 2016 23:59:45 +0000 (23:59 +0000)]
Public volumes belong to a single user.
am:
def2123f56 -s ours
Change-Id: I2e71df725f742ab1e29f9b0f7f89285f659f8a35
Jeff Sharkey [Mon, 7 Nov 2016 23:59:38 +0000 (23:59 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731
am:
59bb608433
Change-Id: I6cdf548573e909e11239e9a7a2f4190750a79758
Jeff Sharkey [Mon, 7 Nov 2016 23:59:18 +0000 (23:59 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev am:
d537f76b88 am:
930e77314b
am:
8c73d7989f
Change-Id: Iae899873091306c2e86e184187bea695a1b928bc
Jeff Sharkey [Mon, 7 Nov 2016 23:57:38 +0000 (23:57 +0000)]
Public volumes belong to a single user. am:
6566fbe99b am:
50cc6c111c
am:
0b28736f03
Change-Id: I3f00c1c9a48d064d759e7c3727c4f40c732aa9da
Jeff Sharkey [Mon, 7 Nov 2016 23:54:57 +0000 (23:54 +0000)]
Merge "Public volumes belong to a single user." into nyc-mr1-dev
am:
0f35d29a7e
Change-Id: I6948a2b174ab8a328fdedf80f0adc564aec93e60
Jeff Sharkey [Mon, 7 Nov 2016 23:54:51 +0000 (23:54 +0000)]
Public volumes belong to a single user.
am:
8b38d083c4
Change-Id: I659a2bb47472c71a7248ccb54281073a24e8a19d
Jeff Sharkey [Mon, 7 Nov 2016 23:54:41 +0000 (23:54 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev
am:
b232177c61
Change-Id: I0188c9744af905133ad36ab45705828d5286b804
Jeff Sharkey [Mon, 7 Nov 2016 23:54:35 +0000 (23:54 +0000)]
Public volumes belong to a single user.
am:
6b0079d3bc
Change-Id: Ibcd6221eaa3e15dddd0682c21eae2460cdf1683f
Jeff Sharkey [Mon, 7 Nov 2016 23:51:20 +0000 (23:51 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev am:
d537f76b88
am:
930e77314b
Change-Id: I0dfbf6667e2a8c9f696274aaca08124b6a41d378
Jeff Sharkey [Mon, 7 Nov 2016 23:50:07 +0000 (23:50 +0000)]
Public volumes belong to a single user. am:
6566fbe99b
am:
50cc6c111c
Change-Id: Id8b1fa49f1b2ebef27c0e9f81486c6964781fb68
Jeff Sharkey [Mon, 7 Nov 2016 23:48:57 +0000 (23:48 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7
am:
60acc3e6ab
Change-Id: I105a361b58b19c1102bef2c88a0ad5f281c793c6
Jeff Sharkey [Mon, 7 Nov 2016 23:46:19 +0000 (23:46 +0000)]
Public volumes belong to a single user. am:
3a062a67fa
am:
e80720a731
Change-Id: I2ccf22ad13ff106b1ee3c750258917dee6c6f631
Jeff Sharkey [Mon, 7 Nov 2016 23:43:43 +0000 (23:43 +0000)]
Merge "Public volumes belong to a single user." into nyc-mr1-dev
Jeff Sharkey [Mon, 7 Nov 2016 23:43:23 +0000 (23:43 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev
Jeff Sharkey [Mon, 7 Nov 2016 23:43:18 +0000 (23:43 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev
am:
d537f76b88
Change-Id: I6d76d35678d3a1cbbab3fe0290540fa5fe3c80ad
Jeff Sharkey [Mon, 7 Nov 2016 23:43:14 +0000 (23:43 +0000)]
Public volumes belong to a single user.
am:
6566fbe99b
Change-Id: If636376b98c449aee3794259317e39a3f0f7f163
Jeff Sharkey [Mon, 7 Nov 2016 23:35:40 +0000 (23:35 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev
am:
34849c22e7
Change-Id: I5c57bb60ad565b4382184dbe55fc0e61d2fc3f0f
Jeff Sharkey [Mon, 7 Nov 2016 23:35:34 +0000 (23:35 +0000)]
Public volumes belong to a single user.
am:
3a062a67fa
Change-Id: Ibe40a7985bde6ff6d8bc307c28b94f7b1445c961
Jeff Sharkey [Mon, 7 Nov 2016 23:29:39 +0000 (23:29 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev
Jeff Sharkey [Mon, 7 Nov 2016 23:27:52 +0000 (23:27 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev
Hemal Patel [Mon, 7 Nov 2016 22:32:03 +0000 (22:32 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev am:
80956c99b1 am:
4da8fdaa15
am:
25cba2de54
Change-Id: If60b26c74033350e7d103c69fa0d33f67ac08f63
Hemal Patel [Mon, 7 Nov 2016 22:31:01 +0000 (22:31 +0000)]
Docs: Revised the Drawable example am:
ad302b60f4 am:
32bda49ae3
am:
618d339f3c
Change-Id: I68f8105a901685cf2382dae2982be846746565c2
Hemal Patel [Mon, 7 Nov 2016 22:22:06 +0000 (22:22 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev am:
80956c99b1
am:
4da8fdaa15
Change-Id: I9596ce508e799a82c8224bb5e33d30c8de94311b
Hemal Patel [Mon, 7 Nov 2016 22:21:07 +0000 (22:21 +0000)]
Docs: Revised the Drawable example am:
ad302b60f4
am:
32bda49ae3
Change-Id: I811bb218f83087c5dd602b4382c7496e019dcb0b
Hemal Patel [Mon, 7 Nov 2016 22:11:06 +0000 (22:11 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev
am:
80956c99b1
Change-Id: I9a030b5080f7c1abe9a9e00404a7b72979e27aec
Hemal Patel [Mon, 7 Nov 2016 22:10:59 +0000 (22:10 +0000)]
Docs: Revised the Drawable example
am:
ad302b60f4
Change-Id: I3504dde2e7a31a50c59e3be239ae0160f84435ef
Hemal Patel [Mon, 7 Nov 2016 21:57:46 +0000 (21:57 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev
Damien Bargiacchi [Wed, 2 Nov 2016 04:44:20 +0000 (21:44 -0700)]
Allow config.xml to set the default display's default color mode
Bug:
31928803
Change-Id: I2707ae47611dca134fa9b4afa2d09e0812b3efd3
Hemal Patel [Tue, 4 Oct 2016 01:27:18 +0000 (18:27 -0700)]
Docs: Revised the Drawable example
Revised the Drawable example with VectorDrawable-friendly example
Bug:
18009084
Change-Id: Ia6d0ad46a352601c7032244b17d28b9dd690de1d
TreeHugger Robot [Fri, 4 Nov 2016 19:49:23 +0000 (19:49 +0000)]
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev
Michael Kwan [Fri, 4 Nov 2016 19:14:41 +0000 (19:14 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
am:
040b4826c2 -s ours
Change-Id: I5b476dd054dab199135b3e8bb088d83d665e7be7
Greg Plesur [Fri, 4 Nov 2016 14:02:09 +0000 (14:02 +0000)]
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev
Greg Plesur [Tue, 1 Nov 2016 16:33:15 +0000 (12:33 -0400)]
If the current device is a watch, fix DeviceOwner/ProfileOwner logic.
In this case, don't require the device to have gone through the
Setup Wizard before disqualifying DO/PO if there's an incompatible
account on the device.
BUG:
32438704,
32438210
Change-Id: I6858db13c8df6e95d01d18a903f4343f70370e8b
Greg Plesur [Thu, 3 Nov 2016 20:15:15 +0000 (20:15 +0000)]
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
Michael Kwan [Thu, 3 Nov 2016 19:48:53 +0000 (19:48 +0000)]
Merge "Disable multiwindow support for watch devices by default." into cw-f-dev
Michael Kwan [Thu, 3 Nov 2016 08:04:24 +0000 (01:04 -0700)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.
Bug:
30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
Greg Plesur [Wed, 2 Nov 2016 21:10:27 +0000 (17:10 -0400)]
New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.
Previous versions of Wear forced this flag to "true."
BUG:
32591969
Change-Id: I9619eee5df5f67e92818ef0b7b45ddd2299449f1
Michael Kwan [Thu, 3 Nov 2016 08:04:24 +0000 (01:04 -0700)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.
Bug:
30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
Michael Kwan [Thu, 3 Nov 2016 08:09:08 +0000 (01:09 -0700)]
Disable multiwindow support for watch devices by default.
Bug:
30120559
Change-Id: I458eac557e38fd32533a98cca7cbbabc5fa08b09
Jeff Sharkey [Wed, 2 Nov 2016 21:26:01 +0000 (15:26 -0600)]
Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.
To use the device under a different user, switch users and then
eject/remount the device.
Test: verified user isolation of USB drive
Bug:
32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
Jeff Sharkey [Wed, 2 Nov 2016 21:26:01 +0000 (15:26 -0600)]
Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.
To use the device under a different user, switch users and then
eject/remount the device.
Test: verified user isolation of USB drive
Bug:
32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
Jeff Sharkey [Wed, 2 Nov 2016 21:26:01 +0000 (15:26 -0600)]
Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.
To use the device under a different user, switch users and then
eject/remount the device.
Test: verified user isolation of USB drive
Bug:
32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
Phil Weaver [Wed, 2 Nov 2016 17:20:20 +0000 (17:20 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
am:
7ffc2a62ff
Change-Id: Id1f42e0dcb96e9dab884faa5ecd070ced3c4fba2
Phil Weaver [Wed, 2 Nov 2016 17:20:17 +0000 (17:20 +0000)]
Revert "Don't invalidate list data during layout."
am:
866ded50bb
Change-Id: I191c26bfb9488d5d67514a81387a9cde95a20eb4
Phil Weaver [Wed, 2 Nov 2016 17:13:22 +0000 (17:13 +0000)]
Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
Shuo Gao [Wed, 2 Nov 2016 16:03:00 +0000 (16:03 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours am:
90c736f892 -s ours
am:
e319e7335c -s ours
Change-Id: I848f238db11bc2f67fec83cb157d3cb3faec0212
Thomas Buhot [Wed, 2 Nov 2016 16:02:09 +0000 (16:02 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours am:
eae299874c -s ours
am:
5e089ad195 -s ours
Change-Id: I0062bfb72567ae43dbf50a1127e22b2363cac9e1
Shuo Gao [Wed, 2 Nov 2016 15:57:25 +0000 (15:57 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours am:
41bdd3a668 -s ours
am:
90c736f892 -s ours
Change-Id: I38668b4a372530962a0ae0d6e2a717319731dff0
Thomas Buhot [Wed, 2 Nov 2016 15:56:38 +0000 (15:56 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours am:
40d2aa1edc -s ours
am:
eae299874c -s ours
Change-Id: I6a8b5337f38b099bee806451db1df44c723e6596
Shuo Gao [Wed, 2 Nov 2016 15:51:17 +0000 (15:51 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours
am:
41bdd3a668 -s ours
Change-Id: I70baae78d036713c95c02e9cad497a343d5d1309
Thomas Buhot [Wed, 2 Nov 2016 15:50:38 +0000 (15:50 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours
am:
40d2aa1edc -s ours
Change-Id: I741b9682b066384aadce0dcaf9ca792de015d59e
Shuo Gao [Wed, 2 Nov 2016 15:46:36 +0000 (15:46 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours
am:
eb3696542a -s ours
Change-Id: I9a78875432e05918c574c9d8ea89230067b811cc
Thomas Buhot [Wed, 2 Nov 2016 15:45:43 +0000 (15:45 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours
am:
7b43f2af93 -s ours
Change-Id: Ia6804a8b93168a033075b6e77ac5d1bec63e3d69
Shuo Gao [Wed, 2 Nov 2016 15:41:06 +0000 (15:41 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
am:
1b5d5bd119 -s ours
Change-Id: I6c218970581361c195471ee435f5a91b109911f0
Thomas Buhot [Wed, 2 Nov 2016 15:40:34 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
am:
80e6d8873b -s ours
Change-Id: I521a8a64510e89ee97578fc5e2f600b4a1851bd3
Bill Yi [Wed, 2 Nov 2016 13:03:04 +0000 (13:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
125deebf5d -s ours
Change-Id: Ic90df3a0db800052813e23370e1b80846caae456
Bill Yi [Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)]
Import translations. DO NOT MERGE
am:
7d24dd6448 -s ours
Change-Id: Iadd9f2dcec4c026a70aa5169325a6d3e42d15460
TreeHugger Robot [Wed, 2 Nov 2016 12:57:31 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:57:03 +0000 (12:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 2 Nov 2016 12:55:14 +0000 (12:55 +0000)]
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
Bill Yi [Wed, 2 Nov 2016 02:34:21 +0000 (19:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5b2c1dbb250552bbd446e51b38be6b9508d2bf0c
Auto-generated-cl: translation import
OSDN Git Service
