Siyamed Sinir
|
fdbb552d3b
|
Merge "Dont try to autoSize if TextView is not measured" into oc-dev am: 42b2760525
am: 6a95c58508
Change-Id: Ib79628f6804350222b7d68b49e32aeb99f6cf39c
|
2017-05-30 13:40:53 +00:00 |
|
Jiaquan He
|
6b830b4e09
|
Merge changes from topic 'highlight_fixed' into oc-dev am: 759669988b
am: 778523ca5c
Change-Id: Ida41d373fac39153c2f16c1508e81d231872d62b
|
2017-05-30 13:36:09 +00:00 |
|
Jiaquan He
|
2a03e99843
|
Check state_focus in foreground. am: 0bdf1c9c76
am: 74282f0745
Change-Id: I6266996179177f5812a82537510bf58e5c3f6b0d
|
2017-05-30 13:34:35 +00:00 |
|
Selim Cinek
|
e1411aa701
|
Merge "Fixed a bug where min-priority were in the middle" into oc-dev am: 7ddf54211f
am: 613ac93620
Change-Id: If2740716c8e5093176a839f880d8681109e63356
|
2017-05-30 13:30:59 +00:00 |
|
Andrii Kulian
|
5454bac391
|
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev am: e63965cef5
am: 83876c735e
Change-Id: I843e2469694c31ee23148ae09cb7b9c5d7506bfc
|
2017-05-30 13:28:29 +00:00 |
|
Jakub Pawlowski
|
e6c56b7dfe
|
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp am: 658e1ddc7e" into oc-dev-plus-aosp
am: 8546ca67da
Change-Id: Ice5353450b11baef89c1bdd34ac44e8644139b86
|
2017-05-30 13:26:19 +00:00 |
|
Jiaquan He
|
c2ed8f4527
|
Merge "Fix the back button ripple." into oc-dev am: a7914f24dd
am: 665d86a0fa
Change-Id: I27e94ab8e43fec9339cac03b49738069c1dbe206
|
2017-05-30 13:23:52 +00:00 |
|
Jakub Pawlowski
|
93ba4b1e1a
|
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd am: 138f75bbc8
am: bf79e36f57
Change-Id: I76b80aa77fa77fa66597fb94dcd8fef703a4f1ff
|
2017-05-30 13:21:37 +00:00 |
|
Yuka Anami
|
1319728c86
|
Merge "Add ID_LENGTH field for Empty type record" into oc-dev am: bb63b4a376
am: 0c7e85da54
Change-Id: Ieee8273e8a32b15e060be4ffd835f4a964c4b5ac
|
2017-05-30 13:19:20 +00:00 |
|
Ruchi Kandoi
|
0c46762337
|
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781 am: 3377e1fc91
am: cd9d36f665
Change-Id: Ia7d3be56ce538cbb40c72673b8c2824d0a76b82b
|
2017-05-30 13:17:11 +00:00 |
|
Yuka Anami
|
c476311eb3
|
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314 am: 269cb38bb9
am: 50b8697071
Change-Id: I9fea9b4a931d334af711fa8e102594fb24f350fa
|
2017-05-30 13:14:44 +00:00 |
|
Sergey Vasilinets
|
16af41b1e3
|
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev am: bacaffa497
am: 6190ec9b03
Change-Id: I7287ab2c8e765620df72326383e9361e1561478b
|
2017-05-30 13:11:47 +00:00 |
|
Julius D'souza
|
7df6625d08
|
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev am: f4abac4d8f -s ours
am: d9251bad5b -s ours
Change-Id: Ia059d6a9eb146abedd2f05953c79362b457eab97
|
2017-05-30 13:09:33 +00:00 |
|
Julius D'souza
|
67f0426533
|
Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission. am: b9a71dfd38 -s ours
am: eac7a439d0 -s ours
Change-Id: I75acd2db31e9bfd3297326800374858443743a35
|
2017-05-30 13:01:08 +00:00 |
|
Julia Reynolds
|
8a94dae6ed
|
Merge "Properly read vibration setting on boot." into oc-dev am: 2c324042df
am: f9d4e9428b
Change-Id: Ia55bfa05ebcf97262d9725028d67d3de5a4f33e5
|
2017-05-30 12:55:09 +00:00 |
|
Felipe Leme
|
5260fe09f5
|
Merge "Disable autofill while user setup is not completed." into oc-dev am: 3540463b74
am: d51bf85e6c
Change-Id: I5a55fa8fbedfdeb3721a9b0c1e0c24c3602f2bfd
|
2017-05-30 12:50:44 +00:00 |
|
Amith Yamasani
|
bb040c5a6b
|
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev am: 22c2be0fbc
am: 85e6dd985b
Change-Id: I1c6e773427438e0474ca44ba49dddfcafdaea3da
|
2017-05-30 12:41:10 +00:00 |
|
Alan Viverette
|
2f5608f38a
|
Merge "Resolve inflate attr against default package" into oc-dev am: bd8fb0e71d
am: 9c0108304c
Change-Id: Icbf1a40dee9adc71785f21d8d4ba0b3f78c3e3ed
|
2017-05-30 12:35:32 +00:00 |
|
Jason Monk
|
342acbfd38
|
Merge "Fix QS Detail header touch target" into oc-dev am: b25f52c042
am: d58b721e55
Change-Id: I56b59ebb4d6c8c70fa1b9bf8810f921045c88d83
|
2017-05-30 12:32:51 +00:00 |
|
Selim Cinek
|
16277fcc93
|
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev am: 76926df97e
am: f802c625ca
Change-Id: I281d04089f5ef83e22d0c15a25bacbc5dd1e4b34
|
2017-05-30 12:29:13 +00:00 |
|
Benoit Lamarche
|
f30d552575
|
Merge "resolve merge conflicts of daeafccfa9 to master"
|
2017-05-30 12:26:03 +00:00 |
|
Jason Monk
|
769139da03
|
resolve merge conflicts of daeafccfa9 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39
|
2017-05-29 11:10:28 +02:00 |
|
TreeHugger Robot
|
31581eb45e
|
Merge "Scrim opacity varies based on notification count"
|
2017-05-27 01:36:54 +00:00 |
|
TreeHugger Robot
|
5d2afb943e
|
Merge "Avoid locking in getCurrentUser when there is no user switch"
|
2017-05-27 01:23:19 +00:00 |
|
Siyamed Sinir
|
6a95c58508
|
Merge "Dont try to autoSize if TextView is not measured" into oc-dev
am: 42b2760525
Change-Id: I737e9498b08de1a8447db39b194fe1640c721f2d
|
2017-05-27 00:27:58 +00:00 |
|
Jiaquan He
|
778523ca5c
|
Merge changes from topic 'highlight_fixed' into oc-dev
am: 759669988b
Change-Id: I1856f049fbb1f76e728f881c088579309b81a57c
|
2017-05-27 00:20:56 +00:00 |
|
Jiaquan He
|
74282f0745
|
Check state_focus in foreground.
am: 0bdf1c9c76
Change-Id: Ie7b36dfa723a110d553c2f6a5926314758e0da53
|
2017-05-27 00:19:35 +00:00 |
|
Siyamed Sinir
|
42b2760525
|
Merge "Don’t try to autoSize if TextView is not measured" into oc-dev
|
2017-05-27 00:13:39 +00:00 |
|
TreeHugger Robot
|
759669988b
|
Merge changes from topic 'highlight_fixed' into oc-dev
* changes:
Check default focus highlight for ImageView.
Check state_focus in foreground.
|
2017-05-27 00:11:10 +00:00 |
|
Makoto Onuki
|
abc1753cac
|
Merge "Some service tests are missing size annotations"
|
2017-05-26 23:40:02 +00:00 |
|
Lucas Dupin
|
a0bf851a55
|
Scrim opacity varies based on notification count
Test: visual
Bug: 62068907
Change-Id: I7055f47443bf6520e42c00797d5c76108a824465
|
2017-05-26 16:39:44 -07:00 |
|
Selim Cinek
|
613ac93620
|
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
am: 7ddf54211f
Change-Id: I7cbee601bd0401e7ac20fdd2d2527f11dafcb068
|
2017-05-26 23:38:48 +00:00 |
|
Selim Cinek
|
7ddf54211f
|
Merge "Fixed a bug where min-priority were in the middle" into oc-dev
|
2017-05-26 23:32:16 +00:00 |
|
Andrii Kulian
|
83876c735e
|
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am: e63965cef5
Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0
|
2017-05-26 23:25:23 +00:00 |
|
Android Build Merger (Role)
|
8546ca67da
|
Merge "Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp am: 658e1ddc7e" into oc-dev-plus-aosp
|
2017-05-26 23:22:16 +00:00 |
|
Jakub Pawlowski
|
233cbbfb25
|
Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp
am: 658e1ddc7e
Change-Id: Ibe20b5786d5155d2e319c3c0620d1da64cbe14e6
|
2017-05-26 23:21:23 +00:00 |
|
Jiaquan He
|
665d86a0fa
|
Merge "Fix the back button ripple." into oc-dev
am: a7914f24dd
Change-Id: I35e474ed44380821278009945529474b6251c23b
|
2017-05-26 23:19:16 +00:00 |
|
Android Build Merger (Role)
|
658e1ddc7e
|
Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp
|
2017-05-26 23:17:33 +00:00 |
|
Jakub Pawlowski
|
a441f455ee
|
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
am: 2acc8e28dd
Change-Id: I3fe5c7c0baf273c9960a56640cd659abd990b858
|
2017-05-26 23:16:35 +00:00 |
|
Andrii Kulian
|
e63965cef5
|
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
|
2017-05-26 23:15:19 +00:00 |
|
Phil Weaver
|
194a323963
|
Merge "Stop populating accessibility nodes with events"
|
2017-05-26 23:15:01 +00:00 |
|
Jakub Pawlowski
|
bf79e36f57
|
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd
am: 138f75bbc8
Change-Id: I8c821ed86a85892af7a77c4a8080a1e9fde9fdfa
|
2017-05-26 23:14:27 +00:00 |
|
TreeHugger Robot
|
a7914f24dd
|
Merge "Fix the back button ripple." into oc-dev
|
2017-05-26 23:10:50 +00:00 |
|
Jakub Pawlowski
|
138f75bbc8
|
Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3
am: 2acc8e28dd
Change-Id: I54a5717690a43e03b2390e1413e06e9c35554e28
|
2017-05-26 23:09:23 +00:00 |
|
Jakub Pawlowski
|
2acc8e28dd
|
Merge "Add 32 and 128 bit Service Data parsing."
am: 725e212de3
Change-Id: I5a5010651b07f2a9c5d1fb25f55602ed5e741d56
|
2017-05-26 23:02:45 +00:00 |
|
Yuka Anami
|
0c7e85da54
|
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
am: bb63b4a376
Change-Id: I923cb6ed3b459f092a24211f7e18076d248ae615
|
2017-05-26 22:58:49 +00:00 |
|
Treehugger Robot
|
725e212de3
|
Merge "Add 32 and 128 bit Service Data parsing."
|
2017-05-26 22:53:29 +00:00 |
|
TreeHugger Robot
|
bb63b4a376
|
Merge "Add ID_LENGTH field for Empty type record" into oc-dev
|
2017-05-26 22:52:04 +00:00 |
|
Sudheer Shanka
|
a50630dd68
|
Merge "Allow ManagedProvisioning to silently uninstall apps"
|
2017-05-26 22:47:56 +00:00 |
|
Ruchi Kandoi
|
cd9d36f665
|
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 am: a50b393781
am: 3377e1fc91
Change-Id: I95e5adffea2ed0d288041ccd357aac7763994359
|
2017-05-26 22:45:24 +00:00 |
|