Commit Graph

16713 Commits

Author SHA1 Message Date
Todd Lee
d5566c6c47 OEM single-build/multi-SKU via dynamic RRO support
The purpose here is to provide support for selectively
enabling Runtime Resource Overlays (RROs) (specifically
those pertaining to a specific SKU, within a OEM's "single
build" covering multiple SKUs) at boot based on the value
of a pre-defined system property.

This mechanism is designed to be compatible with other,
recent changes to Runtime Resource Overlays - specifically:

- has no effect on 'isStatic'. Resource overlays must be
  attributed as static in order to qualify for loading into
  the system_server. The 'requiredSystemPropertyName/
  requiredSystemPropertyValue' mechanism operates
  independent of this and can be used on both static and
  non static overlays. The effect of specifying a conditional
  property on any overlay is that it will ONLY be enabled
  in the event that the system reflects both the property
  and the specified value (Note that in the ABSENCE of a
  conditional property, overlays are assumed to be enabled).

- has no effect on OverlayManagerService (OMS) API. The
  OMS provides the system with an interface through which
  overlays can be enabled/disabled and even rearranged at
  runtime. This provides the basis of support for various
  user-level features (e.g. dynamic theme selection).
  The 'requiredSystemPropertyName/requiredSystemPropertyValue'
  mechanism operates independent of this -
  with enablement being completely coupled to the available
  system properties on the device and NOT subject to change
  at runtime.

Note: as part of this change, original overlay tests have been
updated (fixed) and expanded to include tests to cover the
conditional property implementation.

Issue: http://b/35100249
Test: frameworks/base/core/tests/overlaytests/testrunner.py

Change-Id: I1990ce21a27a385db1e2f53294b69dd03988351e
2017-04-13 19:33:11 -07:00
Jorim Jaggi
4b84606c21 Implement new splash screen API
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests

Bug: 37252694
Change-Id: I9a5bc19b8f63312e682e536500411e4ff4639f88
2017-04-13 16:39:44 -07:00
Seigo Nonaka
b87a2f041d Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev am: d09be1c0e9
am: 284944c7f8

Change-Id: Idae84335677a859641b6660589848e04b4a38474
2017-04-13 17:57:46 +00:00
Seigo Nonaka
284944c7f8 Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev
am: d09be1c0e9

Change-Id: I51f68dc5b1453ca4ac700ca68976efd412812eae
2017-04-13 17:40:02 +00:00
Hyunyoung Song
47da8197b1 Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev am: 76c13a5fce
am: e99cf60039

Change-Id: Ib821f43548e938a7652f62ef444e0a116aa8a58b
2017-04-13 17:31:16 +00:00
Hyunyoung Song
e99cf60039 Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev
am: 76c13a5fce

Change-Id: I060797416983056208f21c099ba21fdc8409103a
2017-04-13 17:20:50 +00:00
Martijn Coenen
59d7c621c3 Merge "Add persistentFeature application attribute." into oc-dev am: e4960cf495
am: e90bf46a78

Change-Id: Ie98918aa2410d629f8283c747d8113f42a640719
2017-04-13 17:20:14 +00:00
Lucas Dupin
0f328d480a Merge "Add transfer mode support to ShapeDrawable" into oc-dev am: 498a44f33a
am: 914519abfb

Change-Id: Ib61666ec7103dab2e40d6e68e8a49fcf4c46a9b2
2017-04-13 17:14:58 +00:00
TreeHugger Robot
d09be1c0e9 Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev 2017-04-13 17:13:37 +00:00
Martijn Coenen
e90bf46a78 Merge "Add persistentFeature application attribute." into oc-dev
am: e4960cf495

Change-Id: Idf9355d092efa1ffb7eacd9299e3a8471396d3d6
2017-04-13 17:12:12 +00:00
Lucas Dupin
914519abfb Merge "Add transfer mode support to ShapeDrawable" into oc-dev
am: 498a44f33a

Change-Id: I09e0f8bbbd8b8ba0123eea3ae5958d453321007c
2017-04-13 17:05:09 +00:00
Hyunyoung Song
76c13a5fce Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev 2017-04-13 16:53:43 +00:00
Martijn Coenen
e4960cf495 Merge "Add persistentFeature application attribute." into oc-dev 2017-04-13 16:53:22 +00:00
Lucas Dupin
498a44f33a Merge "Add transfer mode support to ShapeDrawable" into oc-dev 2017-04-13 16:52:01 +00:00
Orion Hodson
e5983e5270 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 am: 0f7294af11 am: 2d5f14e578
am: c05219d7b3

Change-Id: I5f34ed353c0892d4afadd4869ba7950dc9bd10ca
2017-04-13 13:58:18 +00:00
Seigo Nonaka
0b73a4287e Introduce FontsContract.requestFont and deprecate Typeface.create
Since background fetch should be synchronized with life cycle of
Activities, so should not create new background thread inside this
method. Not to break existing apps, mark as deprecated and will be
removed from public API untile next release.

New API accepts Handler so that the developer can pass their own thread
.

Test: TBD
Bug: 37253785
Change-Id: I87fdc6a354a829db679253824f42489f25698fa0
2017-04-13 06:48:07 -07:00
Orion Hodson
c05219d7b3 Merge "Unhide MethodHandles.explicitCastArguments()" am: 891cab55d3 am: 0f7294af11
am: 2d5f14e578

Change-Id: I9b7a384143ec2dfe3ee55d3949843797f1325d7f
2017-04-13 13:46:57 +00:00
Seigo Nonaka
193743ad1c Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev am: 061db23b79
am: c0c5763793

Change-Id: Ibe1167effdbe6ae39f10793691e2722900cd7af7
2017-04-13 13:33:28 +00:00
Seigo Nonaka
c0c5763793 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev
am: 061db23b79

Change-Id: I7a7d47db8dedd6f75d4884d635cbfcf15949ac43
2017-04-13 13:27:57 +00:00
Treehugger Robot
891cab55d3 Merge "Unhide MethodHandles.explicitCastArguments()" 2017-04-13 13:25:12 +00:00
TreeHugger Robot
061db23b79 Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev 2017-04-13 13:22:10 +00:00
Tadashi G. Takaoka
53042fc5b2 Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev am: d280bfea23
am: 6c8c498b5b

Change-Id: I2da5392ab850cdf9053cfd16d216feffe9afada5
2017-04-13 08:03:37 +00:00
Tadashi G. Takaoka
6c8c498b5b Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
am: d280bfea23

Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
2017-04-13 07:53:39 +00:00
Tadashi G. Takaoka
d280bfea23 Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev 2017-04-13 07:41:34 +00:00
Chong Zhang
5ad4b40999 Merge changes from topic 'api-review' into oc-dev am: fd89a95f35
am: 847beba350

Change-Id: I7abb72fe43b565e3fb4b31418192418b686100f9
2017-04-13 06:45:04 +00:00
Chong Zhang
35af7a8948 MediaCas: address comments for API reviews am: addc39ec27
am: e0c465fefa

Change-Id: If87e2cd96df1a14b7b0c9d753af35fb779c2fbae
2017-04-13 06:43:36 +00:00
Chong Zhang
847beba350 Merge changes from topic 'api-review' into oc-dev
am: fd89a95f35

Change-Id: I297fcfecc54346ee885916eb2e671497c522001f
2017-04-13 06:34:25 +00:00
Chong Zhang
e0c465fefa MediaCas: address comments for API reviews
am: addc39ec27

Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
2017-04-13 06:32:28 +00:00
TreeHugger Robot
fd89a95f35 Merge changes from topic 'api-review' into oc-dev
* changes:
  MediaCas: combine openSession methods
  MediaCas: address comments for API reviews
2017-04-13 06:23:51 +00:00
TreeHugger Robot
2cafa2db05 Merge "Remove support for auto-paging of cursors." 2017-04-13 00:32:05 +00:00
Martijn Coenen
441d61bf16 Add persistentFeature application attribute.
This allows us to only mark processes as persistent
when a feature it actually depends on is present on
the device.

Also adds a "android.hardware.nfc.any" feature, to
indicate the device supports any of the NFC features
that require the NFC process to run persistently.

Bug: 36873979
Bug: 37269025
Test: NFC is still started on devices with NFC
Change-Id: I5792d75d8714f39718fa957177a632efcbbd37d3
2017-04-12 17:09:37 -07:00
Lorenzo Colitti
23cbbe1c73 Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp
am: a7e30062c9

Change-Id: I6500639ae839ee9ad5af34d1292d1539c943e2ad
2017-04-12 23:45:57 +00:00
Hyunyoung Song
92e3da2354 Update API, add more documentation on AdaptiveIconDrawable
and fix multiple miscellaneous bugs.

Bug: 37079814
Bug: 37100106
Bug: 34829216

Test: $ runtest --path=frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java
Test: $ runtest --path=frameworks/base/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
Test: $ runtest --path=frameworks/base/core/tests/coretests/src/android/grpahics/drawable/AdaptiveIconDrawableTest.java

Change-Id: I0f5b2232853031bf3860ebea2736e894d17e4d2e
2017-04-12 16:06:45 -07:00
Android Build Merger (Role)
a7e30062c9 Merge "Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1 am: cfd729093f" into oc-dev-plus-aosp 2017-04-12 23:00:13 +00:00
Lorenzo Colitti
c34f0f7520 Merge changes from topic 'network_specifier' am: d0f476bdae am: 362bef45d1
am: cfd729093f

Change-Id: I7535495681da8f168c46d6d95e13925cffecc99b
2017-04-12 22:58:42 +00:00
Jiaquan He
557922d37a Add a public API defaultFocusHighlightEnabled.
am: b7daaf8b5f

Change-Id: I189aea9c495255fe68f5af98a6d33bd87dc79e3e
2017-04-12 22:53:09 +00:00
TreeHugger Robot
18d993bb72 Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
* changes:
  Fix broken CTS tests.
  Draw a default focus highlight if needed.
  Add a public API defaultFocusHighlightEnabled.
  Detect unhandled keyboard focused state.
2017-04-12 22:40:15 +00:00
Jakub Pawlowski
19d6662777 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b am: ce8de6c3f7
am: 2ef7bb7b06

Change-Id: Id53332e5bfbd22690992b0d010a24d3601c03092
2017-04-12 22:29:26 +00:00
Lorenzo Colitti
d0f476bdae Merge changes from topic 'network_specifier'
* changes:
  [CM] Unhide the NetworkSpecifier as object API
  Make the NetworkSpecifier a class instead of a string.
2017-04-12 22:27:37 +00:00
Svet Ganov
cb98d9d6f3 Merge "Add autofill feature API" into oc-dev am: a402d6dd2f
am: bbef731c2d

Change-Id: I3d1429fe4d101072200aae522a2bdf00596273de
2017-04-12 22:22:39 +00:00
Dianne Hackborn
7ee8c9a485 Merge "Add API to get a uid's current importance." into oc-dev am: ad6ab44e15
am: ef95ec85ea

Change-Id: I1c9dce1a5e6e049de65a5f68231a195b9e5d4510
2017-04-12 22:21:30 +00:00
Selim Gurun
d07efb9ce3 Merge "Deprecate findAddress() method" into oc-dev am: c68b1a8aef
am: 24d68dc3d8

Change-Id: I3cacbe34c084eb6f98a141535293d5c783a9243b
2017-04-12 22:12:57 +00:00
Amit Mahajan
682ce66309 Merge "Add p2 option in openLogicalChannel." into oc-dev 2017-04-12 22:02:39 +00:00
Jakub Pawlowski
2ef7bb7b06 Merge "Bluetooth 5 PHY simplification" am: a9acf9db97 am: d43127865b
am: ce8de6c3f7

Change-Id: I74da41983775b03ee2e642a07b5a8bdcf3be45cf
2017-04-12 21:56:26 +00:00
nharold
5f676fa7b6 Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
am: 9a5d047750

Change-Id: I986d031a47a578fda9f61b58e401e7ff53e24bc3
2017-04-12 21:43:27 +00:00
Seigo Nonaka
ecc3afd49a Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev am: 1e924df63e
am: fa4b862518

Change-Id: I0aa32f46d20a5d46454f2a6057db2ca0e70f1d84
2017-04-12 21:37:09 +00:00
Jesse Evans
93b7acddf8 Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev am: 684b5381e9
am: 3d1676cfc4

Change-Id: I0cc0d165ad5bceb1d93cbe48030e347b53e3caf4
2017-04-12 21:35:09 +00:00
Svet Ganov
bbef731c2d Merge "Add autofill feature API" into oc-dev
am: a402d6dd2f

Change-Id: I5cfa36adbf31c49dffc519963545f388cae4b96d
2017-04-12 21:28:45 +00:00
Dianne Hackborn
ef95ec85ea Merge "Add API to get a uid's current importance." into oc-dev
am: ad6ab44e15

Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac
2017-04-12 21:27:27 +00:00
Jakub Pawlowski
a9acf9db97 Merge "Bluetooth 5 PHY simplification" 2017-04-12 21:22:29 +00:00