Commit Graph

4211 Commits

Author SHA1 Message Date
Jeff Sharkey
e2c9ed48ba Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763
am: 19e2f49181

* commit '19e2f49181b209d790f551b374d6d24002de7c9b':
  API council feedback: hide and document.

Change-Id: I3715fc6e824f2a55517788299afe36145db597d7
2016-05-25 20:54:18 +00:00
Jeff Sharkey
19e2f49181 Merge "API council feedback: hide and document." into nyc-dev
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: Icfcb4e2a9892ecc5dab61cb78598e48fa7714a26
2016-05-25 20:51:07 +00:00
TreeHugger Robot
dfe232c763 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Adam Lesinski
9ed84d8612 Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
am: 5e106dea45

* commit '5e106dea4545547f3f7c50dad30f792809659b96':
  Improve performance of LocaleList with Resources

Change-Id: I733cdad0b30069ac7830fa91ef0188dd0f0cfac9
2016-05-24 21:41:20 +00:00
Adam Lesinski
5e106dea45 Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: Ic43a26915a28d71a967eb038331a0f3c31bdfe8f
2016-05-24 21:35:56 +00:00
Adam Lesinski
5e5e871fdc Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: I307b4a7c78ff04797fda041afa8106b082951bc9
2016-05-24 21:34:48 +00:00
Adam Lesinski
b61e405397 Improve performance of LocaleList with Resources
We allow each individual Resources object to select the best
Locale for the given APK. This allows one update to the configuration
instead of multiple updates, once the locale is chosen.

The Java locale is selected from the app context's locale.

Bug:28625993
Bug:27325465
Change-Id: I99e1e53f522e560f3b80bbd1e1c605f552dbdff0
2016-05-24 12:54:48 -07:00
Chad Brubaker
be04f7247a Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5
2016-05-23 02:38:19 +00:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
2016-05-23 02:32:19 +00:00
Chad Brubaker
c6a49bb008 Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I470b8e991d590135223066d18b49ff123e0b1f6e
2016-05-23 02:32:19 +00:00
TreeHugger Robot
6812bdf387 Merge "Use an attribute for the network security config resource" into nyc-dev 2016-05-23 02:23:26 +00:00
Roozbeh Pournader
461e71472d Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb
2016-05-20 20:00:39 +00:00
Seigo Nonaka
18bf0e2ad2 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: Ifa6124e9b772b54355b696aa4df1ca94950c64c5
2016-05-20 19:52:55 +00:00
Seigo Nonaka
5ac2c3b4a0 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: I5c7714d3ef54fc7caf6580837d48a1b79e56a892
2016-05-20 19:52:54 +00:00
Roozbeh Pournader
6686711ba2 Merge "Clear locales without changing layout direction." into nyc-dev 2016-05-20 19:42:31 +00:00
Seigo Nonaka
bd5cac67b8 Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.

Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
2016-05-20 17:59:35 +00:00
Jeff Sharkey
d21cad13a6 API council feedback: hide and document.
Hide isMetered() and clarify moveDatabaseFrom() docs.

Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519
2016-05-20 11:34:55 -06:00
Chad Brubaker
c845b2a21c Use an attribute for the network security config resource
Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.

Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
2016-05-19 17:25:41 -07:00
Andrii Kulian
e78cbe1770 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb
am: 6b21f45add

* commit '6b21f45add49cdacaad9e75cbba332fa3b63522c':
  Workaround for ignored resizeableActivity param

Change-Id: Ia8dc3606ff13b1358d657a8280820ed542cb4781
2016-05-19 08:09:07 +00:00
Andrii Kulian
6b21f45add Merge "Workaround for ignored resizeableActivity param" into nyc-dev
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: Ia524867cac9118b6dbe5c7c210cd1a1753fe53e1
2016-05-19 08:06:02 +00:00
Andrii Kulian
ede05733f0 Merge "Workaround for ignored resizeableActivity param" into nyc-dev
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: I93844e807cbedc50b26f98916fe3e79e0ef9afa2
2016-05-19 08:06:02 +00:00
Andrii Kulian
005f9a73fb Merge "Workaround for ignored resizeableActivity param" into nyc-dev 2016-05-19 07:57:20 +00:00
Andrii Kulian
c59e70d520 Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3
am: 81ce16a2e6

* commit '81ce16a2e690fbe808ae4546e0c9b814a7ff2e3d':
  Rename minWidth/Height attributes

Change-Id: I927c32ddf2522de03c6b5a75aa6b80537adf1d38
2016-05-19 01:53:09 +00:00
Andrii Kulian
1699b51cbe Merge "Rename minWidth/Height attributes" into nyc-dev
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: Id7d89884ea46b3900459af10f5b4a4b32139ddd8
2016-05-19 01:48:29 +00:00
Andrii Kulian
81ce16a2e6 Merge "Rename minWidth/Height attributes" into nyc-dev
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
2016-05-19 01:48:19 +00:00
Andrii Kulian
42b3acf9d3 Merge "Rename minWidth/Height attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Andrii Kulian
3f8dc15861 Workaround for ignored resizeableActivity param
If <uses-sdk> tag is below <application> in AndroidManifest.xml then,
when activity is parsed, targetSdkVersion param is not yet set correctly.
Because of that we're defaulting to RESIZE_MODE_FORCE_RESIZEABLE and the
param resizeableActivity will be ignored.
This CL checks if resizeableActivity was set explicitly when targetSdkVersion
is less than N (or not set).

Bug: 28020462
Change-Id: I099f6c00dd50547ddea873e47dbb447869d0be6f
2016-05-18 17:49:26 -07:00
Amith Yamasani
1ab19ea6e6 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
am: dbf0dbd8c2

* commit 'dbf0dbd8c216e801b3d95f83d13ae05c1ba0ea39':
  Retail mode flag and some clients for it

Change-Id: I5f9e7c49759154925c6f20ab3fd647d84259b1bb
2016-05-18 21:01:49 +00:00
Amith Yamasani
dbf0dbd8c2 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 2016-05-18 20:57:12 +00:00
Svetoslav Ganov
891fcc2779 Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70
am: 1129a0f473

* commit '1129a0f4733514043b3f9240dbe77124260d9d53':
  Hide ephemeral API

Change-Id: I79a26bd67329872b8282d9c0d207ab949d815307
2016-05-18 20:21:07 +00:00
Svet Ganov
1129a0f473 Merge "Hide ephemeral API" into nyc-dev
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I1de27c7aac1ba488c755d615f039a069928ba7be
2016-05-18 20:16:38 +00:00
Svet Ganov
75a364eabf Merge "Hide ephemeral API" into nyc-dev
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I033dcf9e551cf3a110aea0b3493e3cdad9a38d80
2016-05-18 20:16:33 +00:00
Svetoslav Ganov
68c2919f70 Merge "Hide ephemeral API" into nyc-dev 2016-05-18 20:10:28 +00:00
Robert Sesek
4b7f83870b Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6
am: ffc715b8f5

* commit 'ffc715b8f5ad7a4cbdb8805f0fd916501ac3ba64':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I1b5570d889c20f8a029a5321a290b6807ce6af77
2016-05-18 15:39:05 +00:00
Robert Sesek
ffc715b8f5 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: I5306ff5f4e9abe6161616873e752cf4d54ed6408
2016-05-18 15:32:54 +00:00
Robert Sesek
a83b4cfc74 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: Ie16d11c4aaa515a570b8b717241d556903198d24
2016-05-18 15:32:18 +00:00
Robert Sesek
f45bc095c6 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 2016-05-18 15:25:41 +00:00
Svet Ganov
2265fddba6 Hide ephemeral API
bug:28825660

Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
2016-05-18 07:38:29 -07:00
Yohei Yukawa
bf4c8f730b Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
am: ddaf3f4681

* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
  Move LocaleList to avoid layering violation.

Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
13fa6b7c48 Merge "Move LocaleList to avoid layering violation." into nyc-dev
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
2016-05-18 02:18:29 +00:00
Amith Yamasani
eb437d4dff Retail mode flag and some clients for it
Bug: 27280140
Change-Id: Ide33e941b9c71eb925b5977d0b0d62198537ca14
2016-05-18 00:07:36 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Robert Sesek
55b2d11cd3 Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.
Bug: 28775488
Change-Id: Ic0473d3664671f0ac5df8412f61ca8c1d029887f
2016-05-17 18:53:13 -04:00
Andrii Kulian
f66a83db41 Rename minWidth/Height attributes
Rename WindowLayout#minimalWidth and #minimalHeight to #minWidth
and #minHeight to be consistent with other APIs.

Bug: 28775586
Change-Id: Ib7dc26318c4391693ef23f908b4d6090138dd0d7
2016-05-17 13:00:53 -07:00
Dianne Hackborn
ae5664af28 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5
am: a24af982ff

* commit 'a24af982fffeeb6d3d4919907b5c27064c5a8ff1':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
2016-05-17 18:39:42 +00:00
Dianne Hackborn
4d7e92b56b Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
2016-05-17 18:38:28 +00:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
2016-05-17 18:32:46 +00:00
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
2016-05-17 18:14:39 +00:00