Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd'
* commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd':
Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2'
* commit '32b07fc6cab290466c010d05667940a9ba5672e2':
docs: add dev guide for getting user location
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp
* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp
* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
docs: add dev guide for getting user location
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp
* commit '97c2d840a10813164d82571775a3566637d6c5de':
fix some doc errors in the resources;
The ratio between densities is not constant.
The Exception for dpi qualifier in point 4 of the algorithm should be detailed.
I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.
Cherry-picked from master CL 59188.
Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c
The ratio between densities is not constant.
The Exception for dpi qualifier in point 4 of the algorithm should be detailed.
I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.
Change-Id: Icf7494c23f7e3af7d3c6aab770d0ba3c1fea2ebf
Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938'
* commit '3b3e368c73f4224b055635e6e79f57cc702d8938':
docs: add information about using color resources as drawables
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'
* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
docs: lots of additions to the resources docs
Also improve the documentation to make it a little less unclear what this
is all about. In particular, explain why the original submitter's complaint
about "zero" never being used in English, is expected behavior.
Bug: 2663392
Change-Id: Iade3b4f5c549ce01a95fd0e7e5c6ea394178eda3
Merge commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e'
* commit 'b2d1a71bcc7d40f2a6ca06ddcc92e3cd2a135d1e':
docs: revise menu guide to focus more on using menu resources
Merge commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9'
* commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9':
docs: update backup dev guide with Android Backup Service registration info
new drawable resources
add <merge> and <include> to layout resource
update drawable class descriptioons to point to resources guide
add ID resource type
Change-Id: I733eec50bb2671f28c9e6dd7dec14eb6586f5193
Merge commit '0b16e6a0347c519ccf56b3b956c086889856fec3'
* commit '0b16e6a0347c519ccf56b3b956c086889856fec3':
docs: small edits to catchup to edits made in html pushed live
Merge commit '522d990741b74b4d79f9675da7f32c482253407b'
* commit '522d990741b74b4d79f9675da7f32c482253407b':
docs: add information about known issues in resource matching
for screen density and system version.
Add section about providing compatibility for multiple devices
bug: 2760561
Change-Id: I9b3a515a14d53923a15b1931f6dd24f295874362
