306574 Commits

Author SHA1 Message Date
Yuichi Araki
fd62c58ede Merge "Fix doc for setReparentWithOverlay" 2017-02-07 07:35:48 +00:00
TreeHugger Robot
86613acaac Merge "Import translations. DO NOT MERGE" 2017-02-07 04:31:15 +00:00
TreeHugger Robot
27d151749f Merge "Import translations. DO NOT MERGE" 2017-02-07 04:30:39 +00:00
Soroosh Mariooryad
e622690efa Merge "Modifying SuggestionParser to support dismiss logic of smart suggestions." 2017-02-07 02:12:58 +00:00
TreeHugger Robot
ad8cab3892 Merge "Show saved networks before scored networks." 2017-02-07 02:06:33 +00:00
TreeHugger Robot
f546dbf39d Merge "Fix NetworkPolicyManagerServiceTest." 2017-02-07 01:56:18 +00:00
Doris Ling
93d53bc578 Merge "Remove category key SYSTEM_INPUT" 2017-02-07 01:51:19 +00:00
Soroosh Mariooryad
56ce766e92 Modifying SuggestionParser to support dismiss logic of smart
suggestions.

Test: RunSettingsLibRoboTests
Fixes: 35059823
Change-Id: I8c257f4f89f7dbc179aee85e013bdaecc8c3c09c
2017-02-06 17:37:49 -08:00
Android Build Merger (Role)
56d70eec4a Merge "Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970 am: 558e5dac4d am: ffa46b2053" 2017-02-07 00:58:38 +00:00
TreeHugger Robot
f69ffd24b8 Merge "Fingerprint: get auth id for non-current user." 2017-02-07 00:58:17 +00:00
Miao Wang
deaff9a411 Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970 am: 558e5dac4d
am: ffa46b2053

Change-Id: I9018e4e53e84373efda8772db48f9d2446629d53
2017-02-07 00:58:02 +00:00
Jack Yu
73bfa1a87a Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1 am: 84e84a73b7
am: 46c9c133e0  -s ours

Change-Id: I79cb760c9b67874ed3b610743727a28f55bbe2c6
2017-02-07 00:56:23 +00:00
Tyler Gunn
eb4613371c Merge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2 am: 6a643c3a60
am: efeae9bca4  -s ours

Change-Id: I0f30285eb2f851fd0c5ab1a3e94a40a426251ba1
2017-02-07 00:55:16 +00:00
Selim Cinek
d755dd0e72 Merge "Fixed test failures for notification comparator" 2017-02-07 00:43:46 +00:00
Casey Burkhardt
edb54686c2 Merge "Initial implementation of Nav Bar Accessibility Button" 2017-02-07 00:14:49 +00:00
Miao Wang
ffa46b2053 Merge "Remove uncessary dependency of libhwui" am: df36be5f17 am: eebd7d7970
am: 558e5dac4d

Change-Id: I99b2fded709c63c71fd9d9f02020a986e3025fa6
2017-02-07 00:12:49 +00:00
Jack Yu
46c9c133e0 Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2 am: 7eac8ec7c1
am: 84e84a73b7

Change-Id: I9aab25b14a5774ff5c7d64c5bc6a8aa5490d9ec0
2017-02-07 00:08:12 +00:00
Miao Wang
558e5dac4d Merge "Remove uncessary dependency of libhwui" am: df36be5f17
am: eebd7d7970

Change-Id: I3e7b282340259eaad71569e8a15f5028852852ee
2017-02-07 00:08:05 +00:00
Tyler Gunn
efeae9bca4 Merge "Self managed CS implementation." am: d736a6b2c2 am: 6bd991b3d2
am: 6a643c3a60

Change-Id: I43f59846ecc7601730aa3a15b106292d7ace0df0
2017-02-07 00:05:09 +00:00
Jack Yu
84e84a73b7 Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2
am: 7eac8ec7c1

Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
2017-02-07 00:04:04 +00:00
Tyler Gunn
6a643c3a60 Merge "Self managed CS implementation." am: d736a6b2c2
am: 6bd991b3d2

Change-Id: Id406ceb476573d3cebc12ce27652d814dd679733
2017-02-07 00:01:04 +00:00
Justin Klaassen
e7f68ac380 Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev am: 1f56b60981
am: 2d93a66f47  -s ours

Change-Id: I687fc15866a7e34f1e92d3cd0180cabb40995b14
2017-02-06 23:34:25 +00:00
Justin Klaassen
253c2093a5 Remove experimental twilight-based automatic brightness am: 614f40ea01
am: 46d3d6d313  -s ours

Change-Id: I1a5c10202175b9c5c4afc300c444fd4e5403839e
2017-02-06 23:33:25 +00:00
Justin Klaassen
2d93a66f47 Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev
am: 1f56b60981

Change-Id: I63139d266461878a666527bd1798f621b1278bf6
2017-02-06 23:28:37 +00:00
Justin Klaassen
46d3d6d313 Remove experimental twilight-based automatic brightness
am: 614f40ea01

Change-Id: I1b0ec1645f38892adb894900b3b3725fc0b23452
2017-02-06 23:28:27 +00:00
TreeHugger Robot
1f56b60981 Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev 2017-02-06 23:21:04 +00:00
Aaron Whyte
1874c5503f Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424 am: 95f418cc52
am: 0eea1cf702

Change-Id: Iafb9437eab726b35f9a9b1d3b31d64cb79d67ad1
2017-02-06 23:11:23 +00:00
Ying Wai (Daniel) Fan
b7a1a0833b Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8 am: b87f8900ce
am: 639236265e

Change-Id: I4b3062b95bf51023e99991d9d0bfd51a5e68d2cf
2017-02-06 23:10:25 +00:00
Aaron Whyte
359ac08111 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424 am: 567cfb01b4
am: 938e80be1e

Change-Id: Ic2cc1a3c9162e6ae7b63974f4a631476af675de5
2017-02-06 23:07:25 +00:00
Aaron Whyte
0eea1cf702 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424
am: 95f418cc52

Change-Id: I5baa412f0a080626ccdd0d087809f8d30ef511ab
2017-02-06 23:07:16 +00:00
Ying Wai (Daniel) Fan
3ee42dfd45 Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8 am: 63f3dbae3c
am: df6a737108

Change-Id: I58ad05780860f4d3ef634b6d07b23583e3e390af
2017-02-06 23:06:25 +00:00
Ying Wai (Daniel) Fan
639236265e Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8
am: b87f8900ce

Change-Id: I460d08b7c28a180584cf855e5e5220c6596d8a77
2017-02-06 23:06:19 +00:00
Aaron Whyte
938e80be1e Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev am: 50fa8ad424
am: 567cfb01b4

Change-Id: I132c3018587e4c2b5766b53c1536494ce1e39f89
2017-02-06 23:02:58 +00:00
Ying Wai (Daniel) Fan
df6a737108 Prevent division-by-zero error when calculating battery capacity. am: 415f8b32e8
am: 63f3dbae3c

Change-Id: I1c97aa2e4c0bbc84c547e4ce3ff98b77c5bba3f4
2017-02-06 23:02:08 +00:00
Aaron Whyte
95f418cc52 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am: 50fa8ad424

Change-Id: Ic5235c90571dc90411570fb16e9003a89e79c183
2017-02-06 23:00:39 +00:00
Ying Wai (Daniel) Fan
b87f8900ce Prevent division-by-zero error when calculating battery capacity.
am: 415f8b32e8

Change-Id: Ie58c329fa0814111291922b9a669ca181d4a487f
2017-02-06 23:00:35 +00:00
TreeHugger Robot
c5ab702686 Merge "Default the lastSelectetNetworkId to -1" 2017-02-06 23:00:26 +00:00
Aaron Whyte
567cfb01b4 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
am: 50fa8ad424

Change-Id: I3306d389c19a42130bda31cb61bc846207b76c35
2017-02-06 22:57:30 +00:00
Ying Wai (Daniel) Fan
63f3dbae3c Prevent division-by-zero error when calculating battery capacity.
am: 415f8b32e8

Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
2017-02-06 22:57:23 +00:00
Miao Wang
eebd7d7970 Merge "Remove uncessary dependency of libhwui"
am: df36be5f17

Change-Id: I5ccce1f195a43ff00b9bd7fc350d7ae915c566d7
2017-02-06 22:56:58 +00:00
Manu Cornet
9f204ae94a Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev am: 925d862656
am: ebe26f89e5

Change-Id: I918a93373260e02d3b5157a65d3c23b0f552d30c
2017-02-06 22:55:03 +00:00
Manu Cornet
527df54e58 2D Recents: use correct layout logic for drawing transition headers am: de3cfb0c1f
am: 8e08d0e828

Change-Id: I048d8bb5e3eff94ad87d302f000a6739ad51fc49
2017-02-06 22:53:09 +00:00
Aaron Whyte
50fa8ad424 Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev 2017-02-06 22:49:35 +00:00
Manu Cornet
ebe26f89e5 Merge "2D Recents: use correct layout logic for drawing transition headers" into nyc-mr2-dev
am: 925d862656

Change-Id: I93191bfb1d833134d8afd826c18b0310c7e9c46c
2017-02-06 22:47:34 +00:00
Manu Cornet
8e08d0e828 2D Recents: use correct layout logic for drawing transition headers
am: de3cfb0c1f

Change-Id: I46c45fed648858212a31e477f46ad25475b0710a
2017-02-06 22:47:28 +00:00
Miao Wang
df36be5f17 Merge "Remove uncessary dependency of libhwui" 2017-02-06 22:47:17 +00:00
Jack Yu
7eac8ec7c1 Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
am: 84f97e21b2

Change-Id: Ib35393c60b0800d21507bd5d8ffe35345e6e6926
2017-02-06 22:47:05 +00:00
TreeHugger Robot
68281d4327 Merge "Tests for UserDataPreparer" 2017-02-06 22:43:20 +00:00
Treehugger Robot
84f97e21b2 Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" 2017-02-06 22:41:11 +00:00
Tyler Gunn
6bd991b3d2 Merge "Self managed CS implementation."
am: d736a6b2c2

Change-Id: I9c1a84cade87a208f2e509fb0f32457c64014147
2017-02-06 22:40:39 +00:00