Thomas Buhot
6d69a1668f
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 am: a71a6ec8fb -s ours
...
am: a682048141
2016-11-02 16:12:46 +00:00
Shuo Gao
2aa15664af
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
...
am: 2e40559326
2016-11-02 16:07:59 +00:00
Thomas Buhot
a682048141
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
...
am: a71a6ec8fb
2016-11-02 16:07:10 +00:00
Fan Zhang
31f4c54444
Backward-compat for DashboardCategory with app use old keys
...
- Detect whether an app is using old key, new key, or a mix of both.
-- If app is using new keys, skip. They are already in the new IA.
-- If app is using old/new keys mixed, skip. Using both type of keys
implies the app wants to support old/new platform.
-- If app is using old keys only, map their tiles to new categories.
Bug: 32382487
Test: new unit tests
Change-Id: I3bbd09c531a97801dc382661a8bb10d0391bc177
2016-11-02 09:04:24 -07:00
Shuo Gao
2e40559326
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
2016-11-02 16:03:00 +00:00
Thomas Buhot
a71a6ec8fb
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
2016-11-02 16:02:09 +00:00
Shuo Gao
e319e7335c
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
2016-11-02 15:57:25 +00:00
Thomas Buhot
5e089ad195
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours am: 7b43f2af93 -s ours am: 40d2aa1edc -s ours
...
am: eae299874c
2016-11-02 15:56:38 +00:00
Shuo Gao
90c736f892
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
2016-11-02 15:51:17 +00:00
Thomas Buhot
eae299874c
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours am: 7b43f2af93 -s ours
...
am: 40d2aa1edc
2016-11-02 15:50:38 +00:00
Shuo Gao
41bdd3a668
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am: 1b5d5bd119 -s ours
...
am: eb3696542a
2016-11-02 15:46:36 +00:00
Thomas Buhot
40d2aa1edc
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am: 80e6d8873b -s ours
...
am: 7b43f2af93
2016-11-02 15:45:43 +00:00
Shuo Gao
eb3696542a
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
...
am: 1b5d5bd119
2016-11-02 15:41:06 +00:00
Thomas Buhot
7b43f2af93
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
...
am: 80e6d8873b
2016-11-02 15:40:34 +00:00
Derek Sollenberger
f87da67df9
Adding changes required by the master-skia merge.
...
Test: compile only
Change-Id: I39637a20da439edbf2831952df9bfa12da78e9b9
2016-11-02 11:37:13 -04:00
Mike Reed
c2f31df8b3
use SkBlendMode
...
skbug.com/5814
Test: compile only
Change-Id: Ibbaff43df1117b2ca77fd8f917f03d88cc476330
(cherry picked from commit 26edbcba8a2ed4cb300e7f87e679e3b73cec2772)
2016-11-02 11:36:48 -04:00
Geoffrey Pitsch
253f81b367
Merge "Move notification tests into separate APK."
2016-11-02 14:58:25 +00:00
Bill Yi
87045377c4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours am: 3b99360472 -s ours am: 77323eb2bd -s ours
...
am: f38a9f357a
2016-11-02 13:27:45 +00:00
Bill Yi
77f97ba960
Import translations. DO NOT MERGE am: 7d24dd6448 -s ours am: 1aa04e8cae -s ours am: 70d5453b63 -s ours
...
am: 12bc7f28ad
2016-11-02 13:26:51 +00:00
Bill Yi
9699862842
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ba7f49030 -s ours am: 80914e10e5 -s ours
...
am: c850e6cdac
2016-11-02 13:21:09 +00:00
Bill Yi
6ab02aad7d
Import translations. DO NOT MERGE am: 6fb3b77745 -s ours am: 9e7ac87d08 -s ours
...
am: ddb3a08aba
2016-11-02 13:20:19 +00:00
Nimrod Gileadi
d0f744f2ac
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev am: 523c4fd695 am: 2c2abe6db3
...
am: b633e4402f
2016-11-02 13:19:26 +00:00
Nimrod Gileadi
b9389a7e66
Increment a MetricsLogger counter on back press. am: 580135c1b8 am: 51ac3a911c
...
am: a774e10aec
2016-11-02 13:18:36 +00:00
Geoffrey Pitsch
b879cc614f
Move notification tests into separate APK.
...
This will allow us to hook into a presubmit step without
bringing in the other tests.
Compile notification source directly into test APK, for
faster development.
Test: runtest --path
frameworks/base/services/tests/notification/
Change-Id: I04dbcec892cbd375ba1334f59e6b58bcafe80151
2016-11-02 09:17:27 -04:00
Bill Yi
f38a9f357a
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours am: 3b99360472 -s ours
...
am: 77323eb2bd
2016-11-02 13:16:30 +00:00
Bill Yi
12bc7f28ad
Import translations. DO NOT MERGE am: 7d24dd6448 -s ours am: 1aa04e8cae -s ours
...
am: 70d5453b63
2016-11-02 13:15:36 +00:00
Bill Yi
c850e6cdac
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ba7f49030 -s ours
...
am: 80914e10e5
2016-11-02 13:13:19 +00:00
Bill Yi
ddb3a08aba
Import translations. DO NOT MERGE am: 6fb3b77745 -s ours
...
am: 9e7ac87d08
2016-11-02 13:12:25 +00:00
Nimrod Gileadi
b633e4402f
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev am: 523c4fd695
...
am: 2c2abe6db3
2016-11-02 13:11:33 +00:00
Bill Yi
77323eb2bd
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d -s ours
...
am: 3b99360472
2016-11-02 13:11:18 +00:00
Nimrod Gileadi
a774e10aec
Increment a MetricsLogger counter on back press. am: 580135c1b8
...
am: 51ac3a911c
2016-11-02 13:10:36 +00:00
Bill Yi
70d5453b63
Import translations. DO NOT MERGE am: 7d24dd6448 -s ours
...
am: 1aa04e8cae
2016-11-02 13:10:22 +00:00
Bill Yi
c990515546
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f750173bf1 -s ours
...
am: 015687b026
2016-11-02 13:08:32 +00:00
Bill Yi
4c58e001a2
Import translations. DO NOT MERGE am: 212cda9a9a -s ours
...
am: e2dac2cd85
2016-11-02 13:07:29 +00:00
Bill Yi
80914e10e5
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 7ba7f49030
2016-11-02 13:04:36 +00:00
Bill Yi
9e7ac87d08
Import translations. DO NOT MERGE
...
am: 6fb3b77745
2016-11-02 13:04:35 +00:00
Nimrod Gileadi
2c2abe6db3
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
...
am: 523c4fd695
2016-11-02 13:03:07 +00:00
Bill Yi
3b99360472
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 125deebf5d
2016-11-02 13:03:04 +00:00
Nimrod Gileadi
51ac3a911c
Increment a MetricsLogger counter on back press.
...
am: 580135c1b8
2016-11-02 13:03:04 +00:00
Bill Yi
015687b026
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: f750173bf1
2016-11-02 13:03:03 +00:00
Bill Yi
1aa04e8cae
Import translations. DO NOT MERGE
...
am: 7d24dd6448
2016-11-02 13:03:03 +00:00
Bill Yi
e2dac2cd85
Import translations. DO NOT MERGE
...
am: 212cda9a9a
2016-11-02 13:03:00 +00:00
TreeHugger Robot
1a0b637f19
Merge "Import translations. DO NOT MERGE"
2016-11-02 12:58:39 +00:00
TreeHugger Robot
f750173bf1
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-11-02 12:58:15 +00:00
TreeHugger Robot
125deebf5d
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-11-02 12:57:34 +00:00
TreeHugger Robot
7ba7f49030
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-11-02 12:57:06 +00:00
TreeHugger Robot
217ccca15b
Merge "Import translations. DO NOT MERGE"
2016-11-02 12:56:22 +00:00
TreeHugger Robot
523c4fd695
Merge "Increment a MetricsLogger counter on back press." into cw-f-dev
2016-11-02 12:55:17 +00:00
Hugo Benichi
790815453d
Merge "ApfTest: tag tests with @SmallTest or @MediumTest"
2016-11-02 12:35:48 +00:00
TreeHugger Robot
fc686becb9
Merge "Cross profile candidate should be considered"
2016-11-02 12:13:30 +00:00
