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
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
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
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
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
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
Ruchi Kandoi
3377e1fc91
Merge "Make NFC AIDL callbacks oneway" am: 99c805b319
...
am: a50b393781
Change-Id: I510c06bb3c3fc74ec31baa6b5d3e3c2888067da6
2017-05-26 22:37:26 +00:00
Yuka Anami
50b8697071
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314
...
am: 269cb38bb9
Change-Id: I8bf7940e14a0f2177ff46ef91575922b48716351
2017-05-26 22:30:19 +00:00
Yuka Anami
269cb38bb9
Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83
...
am: 0d9dfc4314
Change-Id: I8e3caa6df525879b820f0611ec751d18df3eb94f
2017-05-26 22:23:53 +00:00
Treehugger Robot
99c805b319
Merge "Make NFC AIDL callbacks oneway"
2017-05-26 22:20:58 +00:00
Sergey Vasilinets
6190ec9b03
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
...
am: bacaffa497
Change-Id: I7306408f2de87edc16d091713eba777a8e58b0ac
2017-05-26 22:16:00 +00:00
Sergey Vasilinets
bacaffa497
Merge "Don't show ripple effect on the element replacing "See All"" into oc-dev
2017-05-26 22:11:27 +00:00
Julia Reynolds
f9d4e9428b
Merge "Properly read vibration setting on boot." into oc-dev
...
am: 2c324042df
Change-Id: I8faa7ef43683d063cd13d54f3961d76621cff31c
2017-05-26 21:52:17 +00:00
TreeHugger Robot
2c324042df
Merge "Properly read vibration setting on boot." into oc-dev
2017-05-26 21:43:29 +00:00
Jiaquan He
1dd48d0b8f
Check default focus highlight for ImageView.
...
This commit specially checks isDefaultFocusHighlightNeeded for
ImageView. We should also check with the content drawable of the
ImageView besides its foreground or background.
Bug: 62141891
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.View_DefaultFocusHighlightTest#testIsDefaultFocusHighlightNeeded
Change-Id: Iaf12a5863d7760d9361d0196a46de07a9ccda74e
2017-05-26 14:31:29 -07:00
Jakub Pawlowski
45033a7e57
Add 32 and 128 bit Service Data parsing.
...
Bug: 62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
2017-05-26 21:11:24 +00:00
Amith Yamasani
85e6dd985b
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
...
am: 22c2be0fbc
Change-Id: Ic92b2b189a02dec2929b972733a26d8caae1822d
2017-05-26 21:10:40 +00:00
Ruchi Kandoi
5dc487d588
Make NFC AIDL callbacks oneway
...
Test: Read NFC tags, Android Beam
Bug: 32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2017-05-26 21:06:25 +00:00
Alan Viverette
9c0108304c
Merge "Resolve inflate attr against default package" into oc-dev
...
am: bd8fb0e71d
Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21
2017-05-26 21:03:07 +00:00
TreeHugger Robot
22c2be0fbc
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
2017-05-26 20:56:12 +00:00
TreeHugger Robot
bd8fb0e71d
Merge "Resolve inflate attr against default package" into oc-dev
2017-05-26 20:54:57 +00:00
Yuka Anami
c03eaa6853
Add ID_LENGTH field for Empty type record
...
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.
Bug: 38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
(cherry picked from commit ef9d0a480ef72a4ff0de5b5afa3661cff81fd8b5)
2017-05-26 20:53:59 +00:00
Yuka Anami
dd0c9bbbb2
Add ID_LENGTH field for Empty type record
...
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.
Bug: 38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
2017-05-26 20:53:10 +00:00
Julia Reynolds
745c15477b
Properly read vibration setting on boot.
...
Test: runtest systemui-notification
Change-Id: I400bc3df441524abe4973d4d6bccc7ef30a2e1c7
Fixes: 37865035
2017-05-26 20:35:16 +00:00
Felipe Leme
fa2d7ffb95
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
...
am: 7990306b8b
Change-Id: Id8d4957a142440c5e9b28bb2009f8299d8d3edf8
2017-05-26 19:06:25 +00:00
Alan Viverette
a7cec30f98
Resolve inflate attr against default package
...
Change-Id: I2de0f79fb4918770c9f816934b1fc4953073a4f1
Fixes: 38456890
Test: LayoutInflaterTest#testInclude
2017-05-26 14:55:49 -04:00
TreeHugger Robot
7990306b8b
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
2017-05-26 18:55:38 +00:00
Adam Lesinski
01b95f9067
Merge "Add ResourceId validation helper method" into oc-dev
...
am: 24c18af14a
Change-Id: I18dc41c220d3cd91c8ce78d93de860064c5f2294
2017-05-26 18:55:15 +00:00
Adam Lesinski
24c18af14a
Merge "Add ResourceId validation helper method" into oc-dev
2017-05-26 18:45:28 +00:00
Amith Yamasani
d0ddeba47b
Use uptime instead of elapsed for measuring duration
...
in time taken to read cpu stats.
This should avoid super long durations > 10 secs that are occasionally
seen in system logs.
Bug: 62104524
Test: manual
Change-Id: I9ed985a61125a207b6d4f6297091bd11b4c78616
2017-05-26 09:46:58 -07:00
Tenghui Zhu
246bf5cb9b
Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
...
am: 36d6a985cd
Change-Id: I53422934c6bf84033fdfff94c5eda79275e91b3a
2017-05-26 16:22:09 +00:00
Tenghui Zhu
36d6a985cd
Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
2017-05-26 16:10:25 +00:00
Felipe Leme
7dca2f6c74
Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
...
am: 25ae29dfd5
Change-Id: If14315daa807243828d0c386638fad38811d99e0
2017-05-26 15:15:50 +00:00
TreeHugger Robot
25ae29dfd5
Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
2017-05-26 15:08:20 +00:00
Julia Reynolds
a98bdea2c5
Merge "Allow some system notifications to be blocked." into oc-dev
...
am: 3a2ac3e11b
Change-Id: I356dcf376002d95238509235389d260e179fea26
2017-05-26 14:53:53 +00:00
Julia Reynolds
3a2ac3e11b
Merge "Allow some system notifications to be blocked." into oc-dev
2017-05-26 14:39:30 +00:00
Tony Mak
754f6e22b0
Merge "Remove the old version of setAffiliationIds" into oc-dev
...
am: 8d902a9e28
Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6
2017-05-26 13:06:23 +00:00
TreeHugger Robot
8d902a9e28
Merge "Remove the old version of setAffiliationIds" into oc-dev
2017-05-26 13:00:40 +00:00
Nicolas Geoffray
7e1a273708
resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9caf7542f11b0b322da063a5a08140384eba0ce0
2017-05-26 11:03:19 +01:00
Nicolas Geoffray
255b69aca0
Merge "Pass bootComplete to dexopt." am: 18c3201986
...
am: 1e35b7b5bc
Change-Id: Id4633d3729c8532d901b33bb6720d8f34df1e6e9
2017-05-26 08:13:49 +00:00
Makoto Onuki
a629afb05e
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
...
am: 58f6f428fc
Change-Id: I108e9cc771457bb537d2857cde8f96607dbb0a8f
2017-05-26 01:37:50 +00:00
Ian Lake
82624f130b
Merge "Relayout when base inner insets change" into oc-dev
...
am: 7f874db5aa
Change-Id: I91bc90559f462d622133a018b1217eae10b6e11b
2017-05-26 01:31:10 +00:00
Adam Powell
f7a9adec31
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
...
am: 05d64e8b72
Change-Id: I3cbf8fbdc9a54f1d47c1ab4c86eaf3f1850f468f
2017-05-26 01:28:41 +00:00
Jeff Sharkey
02315ed73d
Merge "Offer listener to observe StrictMode violations." into oc-dev
...
am: a6b7e0a679
Change-Id: I1610373c91aa4fc2a60732c51145b585b6372729
2017-05-26 01:09:53 +00:00
TreeHugger Robot
58f6f428fc
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
2017-05-26 00:45:42 +00:00
TreeHugger Robot
7f874db5aa
Merge "Relayout when base inner insets change" into oc-dev
2017-05-25 23:25:49 +00:00
TreeHugger Robot
05d64e8b72
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
2017-05-25 23:19:56 +00:00
Felipe Leme
6dcec87ea2
Moar Autofill Framework javadoc improvements:
...
- Fixed WebView < > and API calls.
- Improved description of virtual views.
- Described how to set boundaries of virtual views.
- Improved AUTOFILL_FLAG_INCLUDE_NOT_IMPORTANT_VIEWS doc.
Bug: 37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: Ic0d1e9ff2703c87d4007f0092a2f8dfe0efca6db
2017-05-25 16:10:08 -07:00