OSDN Git Service
Bill Yi [Tue, 7 Feb 2017 14:18:49 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
f3f4f78dc7 -s ours
am:
0e4a8f5f41 -s ours
Change-Id: Ic0894bfb2f8e5d5c9850caf6110e4e24959e6bac
Bill Yi [Tue, 7 Feb 2017 14:17:56 +0000 (14:17 +0000)]
Import translations. DO NOT MERGE am:
b83f6b6f44 -s ours
am:
f8f731cbe6 -s ours
Change-Id: I135bddc74ce28a227a4c2197305be7b5379b2152
Charles He [Tue, 7 Feb 2017 14:17:06 +0000 (14:17 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev am:
15b8313d1b
am:
d7d9c0241f -s ours
Change-Id: I54e46e945fa45b35932efb697b65a3afce34782d
Charles He [Tue, 7 Feb 2017 14:16:05 +0000 (14:16 +0000)]
Fingerprint: get auth id for non-current user. am:
aae60473e1
am:
9b734a7c4c -s ours
Change-Id: I1d37dbf2d5348ed1caa2260a01e0d8449311c6b3
Andreas Huber [Tue, 7 Feb 2017 14:12:09 +0000 (14:12 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am:
97fca8c035 am:
0bae9b1406 am:
0e686542e6
am:
390cd6ceda
Change-Id: I0b1ba7490adaaec8f4eaa7e4afada7425f8c1129
Pavlin Radoslavov [Tue, 7 Feb 2017 14:05:43 +0000 (14:05 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am:
acf34d8b62 am:
cd6e0ee19d am:
b7067e2b6c
am:
537eaf0f6e
Change-Id: I42186a561d59decb0d811b3f5b8d5bf96df53152
Jason Monk [Tue, 7 Feb 2017 14:02:18 +0000 (14:02 +0000)]
Merge "resolve merge conflicts of
a800795a1520 to master"
Andrei Stingaceanu [Tue, 7 Feb 2017 11:19:49 +0000 (11:19 +0000)]
Merge "Clickable spans - trigger onClick onSingleTapUp"
TreeHugger Robot [Tue, 7 Feb 2017 10:13:06 +0000 (10:13 +0000)]
Merge "Extend permissions of cameraserver"
Jaewan Kim [Tue, 7 Feb 2017 07:59:22 +0000 (07:59 +0000)]
Merge "Add oneway keyword for the IOnMediaKeyListener"
Yuichi Araki [Tue, 7 Feb 2017 07:35:45 +0000 (07:35 +0000)]
Merge "Fix doc for setReparentWithOverlay"
TreeHugger Robot [Tue, 7 Feb 2017 04:31:12 +0000 (04:31 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 7 Feb 2017 04:30:36 +0000 (04:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 7 Feb 2017 04:27:54 +0000 (04:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
f3f4f78dc7 -s ours
Change-Id: Ifda84719fb488b46456723973b76ce59caef0aa6
Bill Yi [Tue, 7 Feb 2017 04:27:50 +0000 (04:27 +0000)]
Import translations. DO NOT MERGE
am:
b83f6b6f44 -s ours
Change-Id: I7e228f66a17fbdede843865827fc91f4c6790509
TreeHugger Robot [Tue, 7 Feb 2017 04:21:41 +0000 (04:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Soroosh Mariooryad [Tue, 7 Feb 2017 02:12:55 +0000 (02:12 +0000)]
Merge "Modifying SuggestionParser to support dismiss logic of smart suggestions."
TreeHugger Robot [Tue, 7 Feb 2017 02:06:30 +0000 (02:06 +0000)]
Merge "Show saved networks before scored networks."
TreeHugger Robot [Tue, 7 Feb 2017 01:56:15 +0000 (01:56 +0000)]
Merge "Fix NetworkPolicyManagerServiceTest."
Doris Ling [Tue, 7 Feb 2017 01:51:17 +0000 (01:51 +0000)]
Merge "Remove category key SYSTEM_INPUT"
Soroosh Mariooryad [Mon, 6 Feb 2017 23:23:00 +0000 (15:23 -0800)]
Modifying SuggestionParser to support dismiss logic of smart
suggestions.
Test: RunSettingsLibRoboTests
Fixes:
35059823
Change-Id: I8c257f4f89f7dbc179aee85e013bdaecc8c3c09c
Jason Monk [Tue, 7 Feb 2017 01:25:03 +0000 (20:25 -0500)]
resolve merge conflicts of
a800795a1520 to master
Test: treehugger
Change-Id: I1f4743288021546344966c2b3ca1ee33c73667a8
Charles He [Tue, 7 Feb 2017 01:20:49 +0000 (01:20 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
am:
15b8313d1b
Change-Id: I2d2eca47ab2eb548e48dad733a7956be83511252
Charles He [Tue, 7 Feb 2017 01:20:42 +0000 (01:20 +0000)]
Fingerprint: get auth id for non-current user.
am:
aae60473e1
Change-Id: I547076caaa27d86d682addc14106a344a1b4cec9
Charles He [Tue, 7 Feb 2017 01:15:20 +0000 (01:15 +0000)]
Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev
Charles He [Fri, 27 Jan 2017 16:14:52 +0000 (16:14 +0000)]
Fingerprint: get auth id for non-current user.
Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.
Bug:
33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9
Android Build Merger (Role) [Tue, 7 Feb 2017 00:58:35 +0000 (00:58 +0000)]
Merge "Merge "Remove uncessary dependency of libhwui" am:
df36be5f17 am:
eebd7d7970 am:
558e5dac4d am:
ffa46b2053"
TreeHugger Robot [Tue, 7 Feb 2017 00:58:13 +0000 (00:58 +0000)]
Merge "Fingerprint: get auth id for non-current user."
Miao Wang [Tue, 7 Feb 2017 00:58:02 +0000 (00:58 +0000)]
Merge "Remove uncessary dependency of libhwui" am:
df36be5f17 am:
eebd7d7970 am:
558e5dac4d
am:
ffa46b2053
Change-Id: I9018e4e53e84373efda8772db48f9d2446629d53
Jack Yu [Tue, 7 Feb 2017 00:56:23 +0000 (00:56 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2 am:
7eac8ec7c1 am:
84e84a73b7
am:
46c9c133e0 -s ours
Change-Id: I79cb760c9b67874ed3b610743727a28f55bbe2c6
Tyler Gunn [Tue, 7 Feb 2017 00:55:16 +0000 (00:55 +0000)]
Merge "Self managed CS implementation." am:
d736a6b2c2 am:
6bd991b3d2 am:
6a643c3a60
am:
efeae9bca4 -s ours
Change-Id: I0f30285eb2f851fd0c5ab1a3e94a40a426251ba1
Selim Cinek [Tue, 7 Feb 2017 00:43:43 +0000 (00:43 +0000)]
Merge "Fixed test failures for notification comparator"
Bill Yi [Tue, 7 Feb 2017 00:42:58 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id83eff0bcff1cfadadc4e91ce2d9d58a3f31194e
Auto-generated-cl: translation import
Andreas Huber [Tue, 7 Feb 2017 00:20:19 +0000 (00:20 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am:
97fca8c035 am:
0bae9b1406
am:
0e686542e6
Change-Id: I145b206fc2af5dee4271b94640476507a49f7dbd
Pavlin Radoslavov [Tue, 7 Feb 2017 00:18:40 +0000 (00:18 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am:
acf34d8b62 am:
cd6e0ee19d
am:
b7067e2b6c
Change-Id: I459480c5bf8e512340d95452c491e9e2986a84a8
Jason Monk [Tue, 7 Feb 2017 00:17:43 +0000 (00:17 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings" am:
96c4f1a21e am:
4e82bf6c51
am:
55345f5c30
Change-Id: I7874cfc1e034577390d5d77ebbdb22358de57b47
Casey Burkhardt [Tue, 7 Feb 2017 00:14:46 +0000 (00:14 +0000)]
Merge "Initial implementation of Nav Bar Accessibility Button"
Miao Wang [Tue, 7 Feb 2017 00:12:49 +0000 (00:12 +0000)]
Merge "Remove uncessary dependency of libhwui" am:
df36be5f17 am:
eebd7d7970
am:
558e5dac4d
Change-Id: I99b2fded709c63c71fd9d9f02020a986e3025fa6
Andreas Huber [Tue, 7 Feb 2017 00:12:13 +0000 (00:12 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am:
97fca8c035
am:
0bae9b1406
Change-Id: I0eb29e3e80243a958aa2520924ea9ad859034cdf
Pavlin Radoslavov [Tue, 7 Feb 2017 00:10:21 +0000 (00:10 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities" am:
acf34d8b62
am:
cd6e0ee19d
Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
Jason Monk [Tue, 7 Feb 2017 00:09:14 +0000 (00:09 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings" am:
96c4f1a21e
am:
4e82bf6c51
Change-Id: I39d311e1b455a7a3e53ac8c1b12d1d67b07972ee
Jack Yu [Tue, 7 Feb 2017 00:08:12 +0000 (00:08 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2 am:
7eac8ec7c1
am:
84e84a73b7
Change-Id: I9aab25b14a5774ff5c7d64c5bc6a8aa5490d9ec0
Miao Wang [Tue, 7 Feb 2017 00:08:05 +0000 (00:08 +0000)]
Merge "Remove uncessary dependency of libhwui" am:
df36be5f17
am:
eebd7d7970
Change-Id: I3e7b282340259eaad71569e8a15f5028852852ee
Tyler Gunn [Tue, 7 Feb 2017 00:05:09 +0000 (00:05 +0000)]
Merge "Self managed CS implementation." am:
d736a6b2c2 am:
6bd991b3d2
am:
6a643c3a60
Change-Id: I43f59846ecc7601730aa3a15b106292d7ace0df0
Jack Yu [Tue, 7 Feb 2017 00:04:04 +0000 (00:04 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am:
84f97e21b2
am:
7eac8ec7c1
Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
Tyler Gunn [Tue, 7 Feb 2017 00:01:04 +0000 (00:01 +0000)]
Merge "Self managed CS implementation." am:
d736a6b2c2
am:
6bd991b3d2
Change-Id: Id406ceb476573d3cebc12ce27652d814dd679733
Andreas Huber [Mon, 6 Feb 2017 23:45:53 +0000 (23:45 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
am:
97fca8c035
Change-Id: Iac2492ccc736b83d6ae46022b643fd229c2c307e
Treehugger Robot [Mon, 6 Feb 2017 23:41:27 +0000 (23:41 +0000)]
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
Justin Klaassen [Mon, 6 Feb 2017 23:34:25 +0000 (23:34 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev am:
1f56b60981
am:
2d93a66f47 -s ours
Change-Id: I687fc15866a7e34f1e92d3cd0180cabb40995b14
Justin Klaassen [Mon, 6 Feb 2017 23:33:25 +0000 (23:33 +0000)]
Remove experimental twilight-based automatic brightness am:
614f40ea01
am:
46d3d6d313 -s ours
Change-Id: I1a5c10202175b9c5c4afc300c444fd4e5403839e
Justin Klaassen [Mon, 6 Feb 2017 23:28:37 +0000 (23:28 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
am:
1f56b60981
Change-Id: I63139d266461878a666527bd1798f621b1278bf6
Justin Klaassen [Mon, 6 Feb 2017 23:28:27 +0000 (23:28 +0000)]
Remove experimental twilight-based automatic brightness
am:
614f40ea01
Change-Id: I1b0ec1645f38892adb894900b3b3725fc0b23452
TreeHugger Robot [Mon, 6 Feb 2017 23:21:01 +0000 (23:21 +0000)]
Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
Pavlin Radoslavov [Mon, 6 Feb 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities"
am:
acf34d8b62
Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea
Aaron Whyte [Mon, 6 Feb 2017 23:11:23 +0000 (23:11 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am:
50fa8ad424 am:
95f418cc52
am:
0eea1cf702
Change-Id: Iafb9437eab726b35f9a9b1d3b31d64cb79d67ad1
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:10:25 +0000 (23:10 +0000)]
Prevent division-by-zero error when calculating battery capacity. am:
415f8b32e8 am:
b87f8900ce
am:
639236265e
Change-Id: I4b3062b95bf51023e99991d9d0bfd51a5e68d2cf
Aaron Whyte [Mon, 6 Feb 2017 23:07:25 +0000 (23:07 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am:
50fa8ad424 am:
567cfb01b4
am:
938e80be1e
Change-Id: Ic2cc1a3c9162e6ae7b63974f4a631476af675de5
Aaron Whyte [Mon, 6 Feb 2017 23:07:16 +0000 (23:07 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am:
50fa8ad424
am:
95f418cc52
Change-Id: I5baa412f0a080626ccdd0d087809f8d30ef511ab
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:06:25 +0000 (23:06 +0000)]
Prevent division-by-zero error when calculating battery capacity. am:
415f8b32e8 am:
63f3dbae3c
am:
df6a737108
Change-Id: I58ad05780860f4d3ef634b6d07b23583e3e390af
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:06:19 +0000 (23:06 +0000)]
Prevent division-by-zero error when calculating battery capacity. am:
415f8b32e8
am:
b87f8900ce
Change-Id: I460d08b7c28a180584cf855e5e5220c6596d8a77
Jason Monk [Mon, 6 Feb 2017 23:03:24 +0000 (23:03 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings"
am:
96c4f1a21e
Change-Id: I42b701c8d390333f6d121bea2ee6c3284e646e9c
Aaron Whyte [Mon, 6 Feb 2017 23:02:58 +0000 (23:02 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am:
50fa8ad424
am:
567cfb01b4
Change-Id: I132c3018587e4c2b5766b53c1536494ce1e39f89
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:02:08 +0000 (23:02 +0000)]
Prevent division-by-zero error when calculating battery capacity. am:
415f8b32e8
am:
63f3dbae3c
Change-Id: I1c97aa2e4c0bbc84c547e4ce3ff98b77c5bba3f4
Aaron Whyte [Mon, 6 Feb 2017 23:00:39 +0000 (23:00 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am:
50fa8ad424
Change-Id: Ic5235c90571dc90411570fb16e9003a89e79c183
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 23:00:35 +0000 (23:00 +0000)]
Prevent division-by-zero error when calculating battery capacity.
am:
415f8b32e8
Change-Id: Ie58c329fa0814111291922b9a669ca181d4a487f
TreeHugger Robot [Mon, 6 Feb 2017 23:00:22 +0000 (23:00 +0000)]
Merge "Default the lastSelectetNetworkId to -1"
Treehugger Robot [Mon, 6 Feb 2017 22:59:50 +0000 (22:59 +0000)]
Merge "Add a mechanism to configure the default A2DP codec priorities"
Aaron Whyte [Mon, 6 Feb 2017 22:57:30 +0000 (22:57 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am:
50fa8ad424
Change-Id: I3306d389c19a42130bda31cb61bc846207b76c35
Ying Wai (Daniel) Fan [Mon, 6 Feb 2017 22:57:23 +0000 (22:57 +0000)]
Prevent division-by-zero error when calculating battery capacity.
am:
415f8b32e8
Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
Miao Wang [Mon, 6 Feb 2017 22:56:58 +0000 (22:56 +0000)]
Merge "Remove uncessary dependency of libhwui"
am:
df36be5f17
Change-Id: I5ccce1f195a43ff00b9bd7fc350d7ae915c566d7
Manu Cornet [Mon, 6 Feb 2017 22:55:03 +0000 (22:55 +0000)]
Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev am:
925d862656
am:
ebe26f89e5
Change-Id: I918a93373260e02d3b5157a65d3c23b0f552d30c
Jason Monk [Mon, 6 Feb 2017 22:53:58 +0000 (22:53 +0000)]
Merge "Hotspot Tile: longclick should open Tethering settings"
Manu Cornet [Mon, 6 Feb 2017 22:53:09 +0000 (22:53 +0000)]
2D Recents: use correct layout logic for drawing transition headers am:
de3cfb0c1f
am:
8e08d0e828
Change-Id: I048d8bb5e3eff94ad87d302f000a6739ad51fc49
Aaron Whyte [Mon, 6 Feb 2017 22:49:32 +0000 (22:49 +0000)]
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
Manu Cornet [Mon, 6 Feb 2017 22:47:34 +0000 (22:47 +0000)]
Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev
am:
925d862656
Change-Id: I93191bfb1d833134d8afd826c18b0310c7e9c46c
Manu Cornet [Mon, 6 Feb 2017 22:47:28 +0000 (22:47 +0000)]
2D Recents: use correct layout logic for drawing transition headers
am:
de3cfb0c1f
Change-Id: I46c45fed648858212a31e477f46ad25475b0710a
Miao Wang [Mon, 6 Feb 2017 22:47:15 +0000 (22:47 +0000)]
Merge "Remove uncessary dependency of libhwui"
Jack Yu [Mon, 6 Feb 2017 22:47:05 +0000 (22:47 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
am:
84f97e21b2
Change-Id: Ib35393c60b0800d21507bd5d8ffe35345e6e6926
TreeHugger Robot [Mon, 6 Feb 2017 22:43:15 +0000 (22:43 +0000)]
Merge "Tests for UserDataPreparer"
Treehugger Robot [Mon, 6 Feb 2017 22:41:10 +0000 (22:41 +0000)]
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
Tyler Gunn [Mon, 6 Feb 2017 22:40:39 +0000 (22:40 +0000)]
Merge "Self managed CS implementation."
am:
d736a6b2c2
Change-Id: I9c1a84cade87a208f2e509fb0f32457c64014147
Manu Cornet [Mon, 6 Feb 2017 22:38:31 +0000 (22:38 +0000)]
Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev
Tyler Gunn [Mon, 6 Feb 2017 22:32:13 +0000 (22:32 +0000)]
Merge "Self managed CS implementation."
Tyler Gunn [Mon, 6 Feb 2017 22:26:43 +0000 (22:26 +0000)]
Merge "Self managed CS implementation."
Brad Ebinger [Mon, 6 Feb 2017 22:25:02 +0000 (22:25 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am:
ed839943e0 am:
b9f4a2d6c1 am:
661689ffb1
am:
4ad1b7bd1e
Change-Id: Ie53119933c6e962921cf0bba93aec3472b795b51
Brad Ebinger [Mon, 6 Feb 2017 22:20:02 +0000 (22:20 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am:
ed839943e0 am:
b9f4a2d6c1
am:
661689ffb1
Change-Id: I2ce1c8504b50b3466853c1102114ed1b0fe03dc1
Eugene Susla [Mon, 6 Feb 2017 22:19:51 +0000 (22:19 +0000)]
Merge "CompanionDeviceManager"
Brad Ebinger [Mon, 6 Feb 2017 22:15:07 +0000 (22:15 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am:
ed839943e0
am:
b9f4a2d6c1
Change-Id: I0b1850f074b1a014277c485b1ee6b5b5577fb9cd
Brad Ebinger [Mon, 6 Feb 2017 22:10:26 +0000 (22:10 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
am:
ed839943e0
Change-Id: Ib8ed5dbf927300503aba1d97af25703b380c56a4
Shuzhen Wang [Mon, 6 Feb 2017 22:06:19 +0000 (22:06 +0000)]
Merge "Camera2: Temporarily remove surface size 0 check"
Jack Yu [Thu, 26 Jan 2017 20:45:57 +0000 (12:45 -0800)]
Renamed voiceNetworkStateChanged and dataNetworkStateChanged
The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.
Test: Build
Merged-In: Icf20ceb3718794f7aa62650816714ac8679d101a
Change-Id: Icf20ceb3718794f7aa62650816714ac8679d101a
Brad Ebinger [Mon, 6 Feb 2017 22:03:29 +0000 (22:03 +0000)]
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
Selim Cinek [Mon, 6 Feb 2017 21:59:04 +0000 (21:59 +0000)]
Merge changes If0edccf8,I086b7bae,I043011c6,I4b05f340,I309097ef, ...
* changes:
Disabling animations now when the screen is off
Fixed a quick flash of the icon when adding a notification
Fixed a bug where the notification icons wouldn't match
Fixed weirdness about last icon in shelf
Fixed a regression where custom notification where unreadable
Fixed a wrong translation calculation on first pull down
Sergei Vasilinetc [Mon, 6 Feb 2017 21:48:58 +0000 (21:48 +0000)]
Merge "Clean up deferredLayers only onGpuContextDestroyed."
Bill Yi [Mon, 6 Feb 2017 21:38:43 +0000 (13:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia2feb848ece3402b9d19d3276f04c8f8af140da8
Auto-generated-cl: translation import
Selim Cinek [Mon, 6 Feb 2017 21:32:47 +0000 (13:32 -0800)]
Fixed test failures for notification comparator
Test: runtest systemui-notification
Change-Id: I16e6142c99553d541d09390142cd16bbdfa724d2
TreeHugger Robot [Mon, 6 Feb 2017 21:35:21 +0000 (21:35 +0000)]
Merge "Adding text input mode to TimePicker."
TreeHugger Robot [Mon, 6 Feb 2017 21:34:10 +0000 (21:34 +0000)]
Merge "Fix NPE when getting the callback cookie."
Stephen Chen [Mon, 6 Feb 2017 21:18:11 +0000 (13:18 -0800)]
Fix NetworkPolicyManagerServiceTest.
Bug:
33349775
Fixes:
33349775
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
Change-Id: Ia4516b65730375a48aa7c7ef1ab89157ffa4f355
TreeHugger Robot [Mon, 6 Feb 2017 21:16:59 +0000 (21:16 +0000)]
Merge "StatusBar: Clean up buzzBeepBlinked and friends"
OSDN Git Service
