Commit Graph

57938 Commits

Author SHA1 Message Date
sergeyv
aa34eef630 Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev am: 394d3df
am: 761f59c

* commit '761f59c19f1a0e527bb533df16abee7fac166dbd':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Ia6abc695ad05362245d25aa6d8b36fc72c508c3a
2016-03-31 00:36:27 +00:00
sergeyv
761f59c19f Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev
am: 394d3df

* commit '394d3dfb2d9ccd2ca2fd7aad06ef2e9a8458a0c7':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Iab1265b6a4c4ff5291259f7e5d9b96c217ee3141
2016-03-31 00:32:41 +00:00
Sergei Vasilinetc
394d3dfb2d Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev 2016-03-30 23:42:34 +00:00
Lorenzo Colitti
f545e52e95 Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev am: 7d4ed2f
am: 882f62d

* commit '882f62dd1a49bdc9ed5a7f13423de0075911d70a':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I201c7099b71fed9edc037ce1d5738086aab35d28
2016-03-30 23:12:11 +00:00
Lorenzo Colitti
882f62dd1a Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev
am: 7d4ed2f

* commit '7d4ed2f5aba19a6b1efb7dc0772f7debfa8a7299':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I86ee864b37109cac50dacbd34685c9c000fb763b
2016-03-30 23:09:25 +00:00
George Mount
ce2725aeb4 Merge "Revert "Run cleanup before end actions of ViewPropertyAnimator."" into nyc-dev am: 6bb61e2
am: a140391

* commit 'a140391f3d9e83361fca23f53e8eda8294f08e66':
  Revert "Run cleanup before end actions of ViewPropertyAnimator."

Change-Id: Iaf2b975c7c0f0bfd064b8bde54e812f83d0198a5
2016-03-30 23:07:07 +00:00
George Mount
a140391f3d Merge "Revert "Run cleanup before end actions of ViewPropertyAnimator."" into nyc-dev
am: 6bb61e2

* commit '6bb61e25a2831dc14b604327a995c36309dfcbc9':
  Revert "Run cleanup before end actions of ViewPropertyAnimator."

Change-Id: I2254f4f2dfa19711fac8ed90e72addb94f4e26b8
2016-03-30 23:04:54 +00:00
Lorenzo Colitti
7d4ed2f5ab Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev 2016-03-30 23:03:18 +00:00
George Mount
6bb61e25a2 Merge "Revert "Run cleanup before end actions of ViewPropertyAnimator."" into nyc-dev 2016-03-30 22:55:29 +00:00
Adam Lesinski
bbc56794e4 Merge "Allow multiple Resources associated with an Activity" into nyc-dev am: d17f96a
am: 7baa521

* commit '7baa5212c24f283fad1eda53d6ef0fd01f1501db':
  Allow multiple Resources associated with an Activity

Change-Id: I4aa2b500028ef733e9ed9708447743f4771ae781
2016-03-30 22:39:54 +00:00
Adam Lesinski
7baa5212c2 Merge "Allow multiple Resources associated with an Activity" into nyc-dev
am: d17f96a

* commit 'd17f96ae007179007765c0f75b6bffb13c9285cb':
  Allow multiple Resources associated with an Activity

Change-Id: I34dd24af289d3384deb72cf66ba076b2f7cfd2e8
2016-03-30 22:37:35 +00:00
Felipe Leme
a86c38f60a Merge "Uses bw_happy_box and bw_penalty_box for Data Saver." into nyc-dev am: a6f98af
am: 1a10817

* commit '1a108171ae7d55684c8590cb78a1ef3cb27c0335':
  Uses bw_happy_box and bw_penalty_box for Data Saver.

Change-Id: I5252e6280887e46f84ad1aaf42a4123cb133f9c7
2016-03-30 22:35:42 +00:00
Felipe Leme
1a108171ae Merge "Uses bw_happy_box and bw_penalty_box for Data Saver." into nyc-dev
am: a6f98af

* commit 'a6f98afbdeda4da14d07b0fed5b6586b08cc5e38':
  Uses bw_happy_box and bw_penalty_box for Data Saver.

Change-Id: I9d6e593ee2b57902c8ca98cbeb6eed212d2c6d82
2016-03-30 22:33:32 +00:00
Adam Lesinski
d17f96ae00 Merge "Allow multiple Resources associated with an Activity" into nyc-dev 2016-03-30 22:33:30 +00:00
Felipe Leme
a6f98afbde Merge "Uses bw_happy_box and bw_penalty_box for Data Saver." into nyc-dev 2016-03-30 22:28:06 +00:00
Yohei Yukawa
06ac74543b Merge "Add IC#closeConnection()." into nyc-dev am: f6f0f5f
am: 9f42270

* commit '9f42270f9b16ef47f713868af0796262b2eafc57':
  Add IC#closeConnection().

Change-Id: I3fca2eb604a485b904099730d317035130b3afbb
2016-03-30 22:11:33 +00:00
Yohei Yukawa
9f42270f9b Merge "Add IC#closeConnection()." into nyc-dev
am: f6f0f5f

* commit 'f6f0f5fbe988cede008168438e469657c62ac51b':
  Add IC#closeConnection().

Change-Id: Id5dff1aab51d7538fe8213a6692aff6069ae8f7a
2016-03-30 22:07:07 +00:00
Philip P. Moltmann
eca4c79d41 Merge "Update print preview when option is changed and clear ranges when they layout changes" into nyc-dev am: 456f1e3
am: 308b84e

* commit '308b84e87afe92168d3c47c0fa884cbc67ddfe9b':
  Update print preview when option is changed and clear ranges when they layout changes

Change-Id: I4ce1a5aa59dd24fb3d01eede821fc810b02dab7c
2016-03-30 21:57:46 +00:00
Yohei Yukawa
f6f0f5fbe9 Merge "Add IC#closeConnection()." into nyc-dev 2016-03-30 21:55:31 +00:00
Felipe Leme
70c57c2810 Uses bw_happy_box and bw_penalty_box for Data Saver.
bw_penalty_box is a blacklist-based firewall chain used to determine
which UIDs do not have access to metered interfaces. It can be used
alone or with bw_happy_box, which is a whitelist-based chain: when
bw_happy_box is enabled, it's included in the bw_penalty_box chain.

Currently, NMPS and NMS uses just bw_penalty_box for both blacklist and
whitelist, so when Data Saver is turned on, it has to build a extensive
list of UIDs to be blacklisted, which can take seconds (since it makes
dozens of iptables, and which forks an iptables process)

This CL changes this behavior so it uses both chain (plus a new
bw_data_saver chain, which is added to the end of bw_happy_box), in
which case the Data Saver switch is much faster (around 120-160ms),
since it requires just 1 or 2 iptables calls (one to switch the
bw_data_saver rule, and another to whitelist the foreground app if it's
not whitelisted yet).

BUG: 27127112
BUG: 26685616

Change-Id: If10222aef9f49a924b07b978d4bdccdd92f9acdb
2016-03-30 14:54:58 -07:00
Philip P. Moltmann
308b84e87a Merge "Update print preview when option is changed and clear ranges when they layout changes" into nyc-dev
am: 456f1e3

* commit '456f1e33b808052377a79b91d34091a356652f2c':
  Update print preview when option is changed and clear ranges when they layout changes

Change-Id: I3fcb5c9041ce0268751010e84fb2e94a0a723b29
2016-03-30 21:53:35 +00:00
Philip P. Moltmann
456f1e33b8 Merge "Update print preview when option is changed and clear ranges when they layout changes" into nyc-dev 2016-03-30 21:44:19 +00:00
George Mount
879a626f18 Revert "Run cleanup before end actions of ViewPropertyAnimator."
This reverts commit e9a4f87852.

This revert is to test to see if the gralloc lock problems are caused by this CL.

Change-Id: I395fd3675dd430c44a5d29b050ba248f3f2bf4cd
2016-03-30 21:33:18 +00:00
Adam Lesinski
7f3f499887 Allow multiple Resources associated with an Activity
Previously it was assumed that one Resources object per Activity would be fine.
This proved to be incorrect, as methods like Context#createConfigurationContext()
expect to create a new Resources object that gets updated whenever the Activity Resources
get updated.

To fix this issue, there exists a master override configuration for each Activity. Subsequent
Resources created for an Activity will be based off that master override configuration, and
will be updated accordingly.

Bug:27644297
Bug:27604953
Change-Id: Idb3d851f55ee7981eec4e3fe28e2ea8d55f1192d
2016-03-30 14:27:11 -07:00
sergeyv
b37d44e267 Hide children in ViewGroup.createSnaphost via internal flag and add test for
it.

bug:27747923
Change-Id: I079b52b176b920bfa4c6749be31fbcd96a4dc42c
2016-03-30 14:20:09 -07:00
Joseph Pirozzo
dcccaf6104 Merge "PBAP client Settings profile." into nyc-dev am: 43b5d98
am: 30a962a

* commit '30a962aa7a2ddced0f59ef3a8f8b3fb64362982c':
  PBAP client Settings profile.

Change-Id: Id977926ff753ecc3fc12faac8e1d5c3daf220bbc
2016-03-30 21:17:42 +00:00
Joseph Pirozzo
30a962aa7a Merge "PBAP client Settings profile." into nyc-dev
am: 43b5d98

* commit '43b5d980d89f4badfe89008febf5fcd6e1ae9d49':
  PBAP client Settings profile.

Change-Id: Ic9b5d151586e5e9a093d6118ddec505c6545f955
2016-03-30 21:13:27 +00:00
Joseph Pirozzo
43b5d980d8 Merge "PBAP client Settings profile." into nyc-dev 2016-03-30 21:00:54 +00:00
Seigo Nonaka
969b3c4f11 Merge "Fix incorrect initial locale negotiation." into nyc-dev am: 48d8a39
am: 0ab71b6

* commit '0ab71b606dd2dcb67466467b1220702d3cdbe1a2':
  Fix incorrect initial locale negotiation.

Change-Id: Iee15eba4a0c6bc95e804857c465f83a01f48a5e8
2016-03-30 19:58:32 +00:00
Seigo Nonaka
0ab71b606d Merge "Fix incorrect initial locale negotiation." into nyc-dev
am: 48d8a39

* commit '48d8a39b7114565838f0db7c7b5ef4bea0819cae':
  Fix incorrect initial locale negotiation.

Change-Id: I8363dbd7df5e79c09a3f0bc0bb3ad00165e302b6
2016-03-30 19:54:21 +00:00
Roozbeh Pournader
48d8a39b71 Merge "Fix incorrect initial locale negotiation." into nyc-dev 2016-03-30 19:44:25 +00:00
Makoto Onuki
24208cf7af Merge "Clean up javadoc." into nyc-dev am: 04a5473
am: 458e843

* commit '458e8436f93cb0e1ca2d2c49bd9e55f5fc11441e':
  Clean up javadoc.

Change-Id: I1193510ae71e49eb5a9bb634b97627cfbf02d5be
2016-03-30 19:21:47 +00:00
Joseph Pirozzo
563c700f70 PBAP client Settings profile.
Add content to Settings and SettingsLib to add a checkbox for PBAP
client profile, and remove the box for PBAP server profile when the
client profile is enabled.

Bug: 27642222
Change-Id: I125559904a8e017a01ae90b1f6425129a87cbee3
2016-03-30 12:20:51 -07:00
Makoto Onuki
458e8436f9 Merge "Clean up javadoc." into nyc-dev
am: 04a5473

* commit '04a5473cbe6823cf19f42b8e92aeeafa45207c8b':
  Clean up javadoc.

Change-Id: I1fe6ecc2cdf9cebf78e5521f132d5200ca6f6bdb
2016-03-30 19:16:57 +00:00
Yohei Yukawa
9f9afe526d Add IC#closeConnection().
It turns out that BaseInputConnection has still depended on a private
API named BaseInputConnection#reportFinish(), which was introduced
4 years ago to work around a UI freeze due to an unbalanced batch edit
count [1].  Note that such an unbalanced batch edit count cannot always
be avoidable.  It can easily occur in the following situations.
 - The current IME crashed during batch edit.
 - The user changed the View focus during batch edit.
 - The current IME called IMM#switchToNextInputMethod() during batch
   edit.

The remaining problem is that #reportFinish() is still an internal API
and only subclasses of BaseInputConnection can implement it, and IMM
calls it when and only when the current InputConnection is
BaseInputConnection or its subclass.  InputConnectionWrapper and any
other InputConnection implementations will never receive such a callback
to clean up InputConnection#{begin, end}BatchEdit(), which is considered
to be a major contributor to UI freeze.

To address the above issue, we unhide BaseInputConnection#reportFinish()
as InputConnection#closeConnection() so that application developers can
receive an appropriate callback to clean up internal state including
unfinished batch edit.

  [1] I5525d776916f0c42d5e6d4a4282aed590d7f0e9a
      9d69ecbf61

Bug: 24688781
Bug: 25332806
Change-Id: I234309c5880c9fe0b299b8bd0f8862796d4dda0d
2016-03-30 12:03:51 -07:00
Makoto Onuki
04a5473cbe Merge "Clean up javadoc." into nyc-dev 2016-03-30 18:56:09 +00:00
Peng Xu
1d888cf0b6 Merge "Several code quality improvements" into nyc-dev am: 50c52c0
am: 1684220

* commit '16842209da671dd34836f8ca68a5a70822ed9e34':
  Several code quality improvements

Change-Id: I707bda857ca8f4d6a7b5a788f75cba2b325ce1e3
2016-03-30 18:15:29 +00:00
Peng Xu
16842209da Merge "Several code quality improvements" into nyc-dev
am: 50c52c0

* commit '50c52c0b34566c4501801062175124f663f118ac':
  Several code quality improvements

Change-Id: I107ab5523dc0b383d576aecc185b8c24807ac5d3
2016-03-30 18:11:00 +00:00
Yigit Boyar
1ab2cf9044 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev am: 7de3b2d
am: c337826

* commit 'c337826536acb05d7f913d65a868a9953b100fee':
  Multiple fixes in ScrollView and HorizontalScrollView

Change-Id: I9c89d5a896c0787126e2948572c0b4964232c403
2016-03-30 18:07:21 +00:00
Peng Xu
50c52c0b34 Merge "Several code quality improvements" into nyc-dev 2016-03-30 18:04:12 +00:00
Yigit Boyar
c337826536 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev
am: 7de3b2d

* commit '7de3b2d89834028c88e7f6590e5682b02e96e32e':
  Multiple fixes in ScrollView and HorizontalScrollView

Change-Id: I00bd3b137343ffb461543beca8ea8d5c9ec1aebe
2016-03-30 18:02:31 +00:00
Rubin Xu
29f23aaf2e Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev am: 5b7ca24
am: 4b86800

* commit '4b8680005545101443e1fbbd3fc5d8a630ce6ae5':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I0ff5173cc61f0c19ef5084c97b8fe34fdf9f78d5
2016-03-30 18:02:08 +00:00
Rubin Xu
4b86800055 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev
am: 5b7ca24

* commit '5b7ca24f14ae4d1189ca7683fdad1ec0e62b88b8':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I499344fa3ae5d978bec6a4f8498f1ca037bd4505
2016-03-30 17:57:50 +00:00
Yigit Boyar
7de3b2d898 Merge "Multiple fixes in ScrollView and HorizontalScrollView" into nyc-dev 2016-03-30 17:51:55 +00:00
Rubin Xu
5b7ca24f14 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 2016-03-30 17:46:18 +00:00
Makoto Onuki
0e65d36607 Clean up javadoc.
Bug 27548047

Change-Id: I10410c969136db634bb98687710d011d159bca07
2016-03-30 10:15:55 -07:00
Clara Bayarri
cc536fd307 Merge "Change default work challenge background color" into nyc-dev am: 30fb053
am: 3fcd1e7

* commit '3fcd1e74f45fd6a5a0ba8ee44d1a8b41204bfaa9':
  Change default work challenge background color

Change-Id: Ie7e8dc153d2486c10cefcc004598cbb4009e6a31
2016-03-30 16:32:13 +00:00
Clara Bayarri
3fcd1e74f4 Merge "Change default work challenge background color" into nyc-dev
am: 30fb053

* commit '30fb0534492478a3f95f6953b31bbb666ced8fe5':
  Change default work challenge background color

Change-Id: Ib9b90a9d84c0502d37fc5b53ef4c83e830a8a822
2016-03-30 16:24:03 +00:00
Makoto Onuki
4f1f7b0167 Merge "ShortcutManager: Support secondary text field." into nyc-dev am: ca0ee28
am: a3d8cdc

* commit 'a3d8cdca997e0577bcb1d9091880a0267e2d3f38':
  ShortcutManager: Support secondary text field.

Change-Id: I5262a756c5fe50e498192aea8e247f46d5742edc
2016-03-30 16:17:36 +00:00
Philip P. Moltmann
18f68dd466 Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev am: a393be9
am: 7f5f0de

* commit '7f5f0de5c4f02c6463594c51b046a0d18d7de038':
  Add cancelation signal to OnRequestPrinterIcon.

Change-Id: I9319a8947be763f57ca607feb66cd1c74c8cebe0
2016-03-30 16:16:58 +00:00