Commit Graph

92225 Commits

Author SHA1 Message Date
Michael Kwan
a8ace160bd Fix default dialog background colour for watch devices. am: 56c25af274
am: 0995a17481

Change-Id: I5cbd81a2a776542190beb669e36146911dc2357c
2016-11-19 00:15:48 +00:00
Michael Kwan
0995a17481 Fix default dialog background colour for watch devices.
am: 56c25af274

Change-Id: I5020e61d35adf3327f4b0e39e5e3e74188392330
2016-11-19 00:12:12 +00:00
Yifan Hong
0758aee6ec Split libhidl into base and transport. am: c46d1b44eb am: 78f6a7c615
am: 3ca2fb074f

Change-Id: I382d91f4cea8577400bba71bcd51e8e9a947215f
2016-11-18 23:27:18 +00:00
Yifan Hong
3ca2fb074f Split libhidl into base and transport. am: c46d1b44eb
am: 78f6a7c615

Change-Id: I95471e3f90ba796b52c3df555b60ad6f49aae5da
2016-11-18 23:20:38 +00:00
Yifan Hong
78f6a7c615 Split libhidl into base and transport.
am: c46d1b44eb

Change-Id: I0bcf04338d71386249de46c015b0e577c47c6e79
2016-11-18 23:14:27 +00:00
Michael Kwan
56c25af274 Fix default dialog background colour for watch devices.
Bug: 33008587
Change-Id: I0fe4f9a7244958406d2a3466393476f7775ae995
2016-11-18 15:02:43 -08:00
Mats 2, Åkesson
6daed59698 Merge "Customization of LTE Signal Bars" am: 3cbf2c2657 am: 5ee2b9384b
am: a16a77781e

Change-Id: Ia9853ec8459355ad3b00e7505dc6af491bf6828d
2016-11-18 21:00:04 +00:00
Mats 2, Åkesson
a16a77781e Merge "Customization of LTE Signal Bars" am: 3cbf2c2657
am: 5ee2b9384b

Change-Id: I82d61b23560e4bdf84caca7e49ddcd367662cb47
2016-11-18 20:56:03 +00:00
Mats 2, Åkesson
5ee2b9384b Merge "Customization of LTE Signal Bars"
am: 3cbf2c2657

Change-Id: I33c625ec49547fde582462687e6229ddf0269b15
2016-11-18 20:50:20 +00:00
Treehugger Robot
3cbf2c2657 Merge "Customization of LTE Signal Bars" 2016-11-18 20:44:14 +00:00
Michael Kwan
07e8c18ff8 Enable swipe to dismiss for watch devices. am: 686de42711
am: ba28331c3a

Change-Id: I1a11c42470c21dced393428eeb5206f34cc8cbc3
2016-11-18 19:30:25 +00:00
Michael Kwan
ba28331c3a Enable swipe to dismiss for watch devices.
am: 686de42711

Change-Id: I3f9b9dcf8f7094bcf59eec643a5f87922486371e
2016-11-18 19:24:27 +00:00
Erik Wolsheimer
d841ee9c81 Merge "Enable swipe to dismiss for watch devices." into cw-f-dev 2016-11-18 19:17:56 +00:00
Scott Main
22a15906f9 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 am: 97be8864e5 am: ec9f41356c
am: e42d88323a

Change-Id: Ic5587ed1d9d4932133a2017c1cf9fc4a5373a2ff
2016-11-18 17:32:12 +00:00
Scott Main
e42d88323a Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973 am: 97be8864e5
am: ec9f41356c

Change-Id: I7cd3a82a73707b1f61c82897c0e7fbc63f33d226
2016-11-18 15:42:08 +00:00
Scott Main
ec9f41356c Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb am: 192a8c4973
am: 97be8864e5

Change-Id: I340207420e0811c74751a96dc30e929a411ea207
2016-11-18 15:36:33 +00:00
Scott Main
97be8864e5 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359 am: c8b11fb7cb
am: 192a8c4973

Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
2016-11-18 15:30:06 +00:00
Scott Main
192a8c4973 Add cross-links between FINE and COARSE location permissions. bug: 25371600 am: 3fef783359
am: c8b11fb7cb

Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
2016-11-18 15:24:18 +00:00
Scott Main
c8b11fb7cb Add cross-links between FINE and COARSE location permissions. bug: 25371600
am: 3fef783359

Change-Id: I7a7e25c37fcd7863f51ea116f624d0bdc2d0c5c6
2016-11-18 15:17:06 +00:00
Yifan Hong
c46d1b44eb Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: I0df309a1096b663cc51ce8badacf05e2a47836a8
2016-11-18 00:03:59 +00:00
Dimitry Ivanov
c8ff9b50ed Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1 am: 6a5e1a7f4a
am: b8e43f60c2

Change-Id: I449cd9a5ceabb13abce3a5d345137025fca33579
2016-11-17 19:06:02 +00:00
Dimitry Ivanov
b8e43f60c2 Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1
am: 6a5e1a7f4a

Change-Id: I096fb9b30c2e11bf7054aefa1bd3deb6974a9d36
2016-11-17 18:57:58 +00:00
Dimitry Ivanov
6a5e1a7f4a Merge "Fix coretests: Remove dependency on libnativehelper"
am: f68cb55cc1

Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc
2016-11-17 18:50:29 +00:00
Treehugger Robot
f68cb55cc1 Merge "Fix coretests: Remove dependency on libnativehelper" 2016-11-17 18:37:42 +00:00
Dimitry Ivanov
43b1b3ff0b Fix coretests: Remove dependency on libnativehelper
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.

This change fixes these problems by removing dependency and renaming
JNI method.

Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
2016-11-16 18:35:35 -08:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
2016-11-17 00:39:07 +00:00
Jerry Zhang
fb4a03c8f8 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6
am: 5cbd151d40

Change-Id: Ie2920ff5a89c5eee28a31803f9775920289e41c4
2016-11-17 00:24:41 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
2016-11-17 00:12:50 +00:00
Jerry Zhang
b37d826204 Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.
2016-11-16 23:59:33 +00:00
FEI WU
13000bebe1 Update colorPrimary in watch am: 9072dcd82c
am: 78fef4c065

Change-Id: I586f1de9d0d8c3860807c3209dba4758e3bd4701
2016-11-16 21:24:23 +00:00
FEI WU
78fef4c065 Update colorPrimary in watch
am: 9072dcd82c

Change-Id: I3a869e0acddb6d0494e352bfb7e926e897105f08
2016-11-16 21:15:38 +00:00
Fei Wu
447fff8589 Merge "Update colorPrimary in watch" into cw-f-dev 2016-11-16 21:05:28 +00:00
Yifan Hong
7ae2aa4ed9 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d am: 2f7a3f9595
am: afe46992b8

Change-Id: If9b589ef262ae97e85dc851bd1a5f3fe3d4c22fa
2016-11-16 19:24:09 +00:00
Yifan Hong
afe46992b8 Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d
am: 2f7a3f9595

Change-Id: Id85f0bb5b53ca3a693ab1bf137627159b6d382d5
2016-11-16 19:16:45 +00:00
Yifan Hong
2f7a3f9595 Merge "Fix include after spliting HidlSupport.h"
am: efd7b9f57d

Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1
2016-11-16 19:10:20 +00:00
Yifan Hong
efd7b9f57d Merge "Fix include after spliting HidlSupport.h" 2016-11-16 19:01:00 +00:00
Hidenari Koshimae
2b08faf2cc Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa am: 9997fcc72c
am: 9f0cc266ce

Change-Id: I75127bfd0fc4ce9256c775eaeb46582afd637e8d
2016-11-16 08:26:00 +00:00
Hidenari Koshimae
9f0cc266ce Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa
am: 9997fcc72c

Change-Id: Ie09949fbc23ad87e159e063a59983a1a6bff98f8
2016-11-16 08:18:30 +00:00
Hidenari Koshimae
9997fcc72c Merge "CountDownTimer: not skip onTick()"
am: 224d9e48fa

Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c
2016-11-16 08:10:54 +00:00
Treehugger Robot
224d9e48fa Merge "CountDownTimer: not skip onTick()" 2016-11-16 07:55:27 +00:00
Scott Main
3fef783359 Add cross-links between FINE and COARSE location permissions.
bug: 25371600

Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
(cherry picked from commit b18745616f)
2016-11-16 04:08:16 +00:00
Yifan Hong
ddf31f604e Fix include after spliting HidlSupport.h
Test: mma

Bug: 32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
2016-11-15 16:02:40 -08:00
Jerry Zhang
935372bfd6 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5)
2016-11-15 15:29:45 -08:00
Hui Shu
1eb8a07e1b Fix WebViewDatabase javadoc.
am: 68d2cc180f

Change-Id: I811966bc364697f5c172cd9b4153d963962d8db2
2016-11-15 20:15:17 +00:00
Selim Gurun
83fbb94e18 Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev 2016-11-15 19:57:42 +00:00
Neil Fuller
9103632f9d Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980
am: ef34053f26

Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf
2016-11-15 17:04:37 +00:00
Neil Fuller
ef34053f26 Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38
am: 98f03f4980

Change-Id: Ia6592370da446e43896fb56d12f734841e137d49
2016-11-15 16:57:32 +00:00
Neil Fuller
98f03f4980 Merge "Correctly handle when the user has no explicit time_12_24 setting"
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
2016-11-15 16:50:29 +00:00
Neil Fuller
8631e19d38 Merge "Correctly handle when the user has no explicit time_12_24 setting" 2016-11-15 16:39:42 +00:00
Yifan Hong
8afcb67a89 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724 am: 2187dc5ca1
am: 41579ea4d4

Change-Id: Ia8f41eb4c76c241088a4cce368409bd61deb5d35
2016-11-15 03:19:19 +00:00