Commit Graph

72252 Commits

Author SHA1 Message Date
TreeHugger Robot
844f24dc7c Merge "Refresh in-memory SharedPreferences instances after restore" 2017-05-30 23:37:38 +00:00
TreeHugger Robot
8f3f7173d1 Merge "Fix typos that cause infinite recursion and CTS test failure." 2017-05-30 23:08:49 +00:00
Robert Carr
edc37a6e21 Merge changes I5762a98d,I39f4e015 into oc-dev am: c56b1d3c98
am: 8a967672d5

Change-Id: I2566c88ca0a55e180fc795414e9ea92ae7322d5e
2017-05-30 21:53:08 +00:00
Roozbeh Pournader
931ed4dab9 Merge "Don't let UnderlineSpans affect text width" 2017-05-30 21:42:24 +00:00
Robert Carr
8a967672d5 Merge changes I5762a98d,I39f4e015 into oc-dev
am: c56b1d3c98

Change-Id: I4e6931609d4a3fc8a0c80b58f9d279f1f65d6a10
2017-05-30 21:39:09 +00:00
TreeHugger Robot
c56b1d3c98 Merge changes I5762a98d,I39f4e015 into oc-dev
* changes:
  ViewRootImpl: More careful draw accounting.
  SurfaceView: Avoid over-reporting DRAW_FINISHED.
2017-05-30 21:33:31 +00:00
Anthony Chen
5ecb30f99c Merge "Allow progress bar dimensions to be configured." 2017-05-30 21:20:21 +00:00
Joe Onorato
53610791a9 Fix typos that cause infinite recursion and CTS test failure.
Bug: 37171450
Test: bit CtsProtoTestCases:*
Change-Id: Ib758756a64fa19eb976dc0a2b1bb1cd6e42fd6f2
2017-05-30 14:06:33 -07:00
Dianne Hackborn
b95db872c8 Merge "Work on issue #62095840: NPE in JobParamteres in the background" into oc-dev am: 1399d3abf5
am: 4d476366be

Change-Id: Ia9fcf1a9cda8a0711f703f445295d258f759b0bb
2017-05-30 20:42:25 +00:00
Dianne Hackborn
4d476366be Merge "Work on issue #62095840: NPE in JobParamteres in the background" into oc-dev
am: 1399d3abf5

Change-Id: I49169ce6f6559d9bfad36693b1582b2d810380b6
2017-05-30 20:31:33 +00:00
Dianne Hackborn
1399d3abf5 Merge "Work on issue #62095840: NPE in JobParamteres in the background" into oc-dev 2017-05-30 20:21:17 +00:00
Christopher Tate
fe2368c38c Refresh in-memory SharedPreferences instances after restore
Existing instances don't know that the file has changed out from
under them, so they continue to return stale values from reads, and
risk overwriting restored data with stale content if writes are
performed.  We now tell the backing cache system to induce a
reload after restore (i.e. after we might have written a relevant
file out from under it).

Along the way we shook out an irregularity in the way we were
setting up the context topology of non-lifecycle instances of
the metadata-handling BackupAgent subclass, so that's fixed
now too.

Bug 12061817
Test: cts-tradefed run cts -m CtsBackupHostTestCases

Change-Id: I401fe9297235b55d8a8f041e430d122dc6e24129
2017-05-30 12:41:39 -07:00
Peter Qiu
421018f44b Merge changes from topic 'hide_passpoint_r2' into oc-dev
am: 4bd47fce86

Change-Id: I71fe905c7842384d7700f02f923b12cdae9bf594
2017-05-30 18:55:37 +00:00
TreeHugger Robot
4bd47fce86 Merge changes from topic 'hide_passpoint_r2' into oc-dev
* changes:
  hotspot2: hide Release 2 APIs
  Voice Messaging Intent API.
2017-05-30 18:47:12 +00:00
Dianne Hackborn
ccc63ec80f Work on issue #62095840: NPE in JobParamteres in the background
Crash early if an app calls jobFinished() with null params.

Test: manual

Change-Id: Icc2cf241edaad00bc5bd49d07a431627bbd76524
2017-05-30 11:04:53 -07:00
Anthony Chen
8f5f358f97 Allow progress bar dimensions to be configured.
Added a new dimension for the bottom margin after the notification
content if there is a progress bar. This value is needed to create a
larger space for the progress bar. If it is adjusted to be larger, than
the progress bar will appear to be further away from the notification
content.

Also add dimensions for the progress bar size. This value needs to also
override the max and min heights otherwise the max/min heights would
differ from the layout_height.

Test: booted on phone and Android Auto headunit
Bug: 33210494
Change-Id: I20011b3f79a0d3f81c6317e715d8d2310c5cd87b
2017-05-30 10:39:57 -07:00
Julia Reynolds
a614d3c8eb Merge "Suppress HUNs according to group alert behavior" into oc-dev am: 8bc45cb78f
am: 393efb57d7

Change-Id: I3d701017ccd7006e146c163ff651ae4e639065c7
2017-05-30 16:57:53 +00:00
Julia Reynolds
393efb57d7 Merge "Suppress HUNs according to group alert behavior" into oc-dev
am: 8bc45cb78f

Change-Id: I86f65c9f8ae331d5b3cc4a35af6a48aa2b04dce1
2017-05-30 16:49:52 +00:00
Renat Aksitov
931983d607 Voice Messaging Intent API.
Removing EXTRA_SENDER_ACCOUNT_HASH, needs more work.

Bug 37747843

Test: make -j11 docs

Change-Id: I3046611510f85cf69ceff7c2274cda3b692581b9
(cherry picked from commit 2c4201448e)
2017-05-30 09:47:42 -07:00
Julia Reynolds
8bc45cb78f Merge "Suppress HUNs according to group alert behavior" into oc-dev 2017-05-30 16:43:39 +00:00
Rob Carr
1a0f783f26 Merge "Fix SurfaceView handler." into oc-dev am: 5366cfbef3
am: 0fc7ca44e8

Change-Id: I39cbc26e1b9c05dd0da7b04c59480812125f2aca
2017-05-30 16:31:01 +00:00
Robert Carr
49cd9f882c ViewRootImpl: More careful draw accounting.
The strategy of beginning the count at 1 isn't enough
and we need to explicitly debt each request to report
draw. Imagine the case where a ViewRootImpl reports draw
multiple times, while we are waiting for a SurfaceView draw
completion callback. Without the explicit draw debt, the ViewRoot
would be counted as drawing for the SurfaceView and we could
notify the WM too early.

Test: Open Chrome a few hundred times. go/wm-smoke.
Bug: 38324871
Change-Id: I5762a98d1cc808125033ba3d1db8a3ea39a9e071
2017-05-30 09:27:44 -07:00
Robert Carr
b53670aecf SurfaceView: Avoid over-reporting DRAW_FINISHED.
To some extent we rely on the app to call the draw callback
if they want the app to work properly, but this case is fairly easy
to detect, so why not prevent it and provide a helpful log.

Bug: 62051758
Test: Warm start camera a few times. go/wm-smoke.
Change-Id: I39f4e015bfa15a1e0c37dba70b4a700803a6a274
2017-05-30 09:27:44 -07:00
Rob Carr
0fc7ca44e8 Merge "Fix SurfaceView handler." into oc-dev
am: 5366cfbef3

Change-Id: I29980e5255957c1830a72707bb20c2de128d76ac
2017-05-30 16:23:49 +00:00
Rob Carr
5366cfbef3 Merge "Fix SurfaceView handler." into oc-dev 2017-05-30 16:17:32 +00:00
Felipe Leme
faed8eb295 Merge "Improved autofillHints documentation." into oc-dev am: 0b1b1c4346
am: fdd1fd3264

Change-Id: I0ee7a603fbc4d2048258b52144cce90409d2e8c3
2017-05-30 14:00:33 +00:00
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
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
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
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
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
Felipe Leme
fdd1fd3264 Merge "Improved autofillHints documentation." into oc-dev
am: 0b1b1c4346

Change-Id: I2aeaefde853f941263fcf677dfdcb3bffc6ab337
2017-05-27 02:30:30 +00:00
TreeHugger Robot
0b1b1c4346 Merge "Improved autofillHints documentation." into oc-dev 2017-05-27 02:25:08 +00:00
TreeHugger Robot
e2b92e904c Merge "Add 32 and 128 bit Service Data parsing." into oc-dev 2017-05-27 01:28:03 +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
Jakub Pawlowski
50f8f3db27 Add 32 and 128 bit Service Data parsing.
Bug: 62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
(cherry picked from commit 45033a7e57)
2017-05-26 16:24:40 -07: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
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