4640 Commits

Author SHA1 Message Date
Adam Lesinski
1e21ff00b0 AAPT2: accept argument file list for -R
Bug:29462255
Change-Id: Ia83919a3e7de7fe2056a3f7613621972cccd49cb
2016-06-24 14:57:58 -07:00
Adam Lesinski
1f6cab321e Merge "AAPT2: Allow <meta-data> in <application> tag" 2016-06-23 22:13:20 +00:00
TreeHugger Robot
6c05d724da Merge "Fix pseudolocalizer at end of string" 2016-06-23 21:54:12 +00:00
Adam Lesinski
5d84ad5487 AAPT2: Allow <meta-data> in <application> tag
Change-Id: Ica3e7d5c1ce587eba58d8171e0f8d5cdb598e7b3
2016-06-23 13:18:16 -07:00
Adam Lesinski
b2106687e1 Fix pseudolocalizer at end of string
The accent pseudolocalizer would incorrectly process
the byte after the end of the string, which would end
up inserting null characters into the resulting
output.

Change-Id: I5cdabd6b0272d94073f06e180b8cbe7abafa3888
2016-06-23 13:03:15 -07:00
Yohei Yukawa
bf055ba658 Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am: dc42d7dd13
am: d02470f5a8

Change-Id: Id551d53ae3d7c34157ddf166aa44bdef67d46853
2016-06-23 01:37:10 +00:00
Yohei Yukawa
d02470f5a8 Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev
am: dc42d7dd13

Change-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc
2016-06-23 01:29:58 +00:00
Yohei Yukawa
dc42d7dd13 Merge "Add InputMethodService#exposeContent()" into nyc-mr1-dev 2016-06-23 01:25:39 +00:00
Yohei Yukawa
25e0813e6e Add InputMethodService#exposeContent()
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.

With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission.  Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.

Here is a sample code snippet about how to use this mechanism.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  exposeContent(contentInfo, getCurrentInputEditorInfo());
  getCurrentInputConnection().commitContent(inputContentInfo, null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

 [1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
      152944f4909c47917473293b258d266435c6ab35
 [2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
      adebb52588b098a1af678d4e33a234ef1ce783b2

Bug: 29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
2016-06-22 16:31:41 -07:00
Adam Lesinski
d06b1695e0 Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev am: aeef7c4748 am: e0dc709ac8
am: c8aa7f98c1

Change-Id: Id3b9a1e0797f26d34415938dee0a032541be2a6c
2016-06-22 22:54:06 +00:00
Adam Lesinski
c8aa7f98c1 Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am: aeef7c4748
am: e0dc709ac8

Change-Id: I2360c6d049352c4e32f33096d3f659d636941417
2016-06-22 22:47:39 +00:00
Adam Lesinski
e0dc709ac8 Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am: aeef7c4748

Change-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f
2016-06-22 22:41:38 +00:00
Roozbeh Pournader
f69d5146bd Merge \\"Don\\'t match locales with different scripts in ResourceFilter\\" into nyc-mr1-dev am: 9d2a3188fa
am: 8a24cfb055

Change-Id: I0c3e03c508680edd7db133b5cc93dbab1383b960
2016-06-22 21:36:56 +00:00
Roozbeh Pournader
8a24cfb055 Merge \"Don\'t match locales with different scripts in ResourceFilter\" into nyc-mr1-dev
am: 9d2a3188fa

Change-Id: I9874c4a5d880407ed7b38e63f2c551defedbf8e5
2016-06-22 21:26:29 +00:00
Adam Lesinski
0f5caab576 Fix build due to missing abstract method impl
getDisplay() was added to Context, which needs to be implemented
for BridgeContext.

Bug:28388969
Change-Id: I7b0ffcbbe252403e35f08d3fa40d6b0e4dbf0daa
2016-06-22 13:11:40 -07:00
Jerome Gaillard
b4e074b159 JUnit-4.11 does not accept static rules
Change-Id: I9a2b986c2a88731d67919449a3ca69d2e73879d1
(cherry picked from commit 588d93eb54e48daabed31f98b100824f1355d8ec)
2016-06-22 11:28:55 +00:00
Diego Perez
35d07d99e0 Merge "Use a mock file to make testGetResourceNameVariants work in jar files" 2016-06-22 11:25:17 +00:00
Diego Perez
53aac79f96 Merge "Incorporate alpha attribute when painting VectorDrawable" 2016-06-22 11:23:19 +00:00
Roozbeh Pournader
3f32c27ccf Don't match locales with different scripts in ResourceFilter
Previously, AAPT would match locales even if they had different
explicit scripts if the requested locale was just a languages. Now
we require explicit listing of the languages with different explicit
scripts in order for the locale to be included.

Bug: 29412034
Change-Id: Ia118a5a7f9aec49f6c3c53b9195a0ae1a57f53fd
2016-06-21 15:03:51 -07:00
Diego Perez
1fa7f02085 Use a mock file to make testGetResourceNameVariants work in jar files
Change-Id: Ic77f8bb2cef3dabeddd3ba530b0eda23e70c9017
(cherry picked from commit 616433e8ba0119b8ce79f76f41e8489030aea2a0)
2016-06-21 14:49:28 +00:00
Diego Perez
86a6b4b94d Avoid radius 0 gradient painting
If the radius is 0, do not try to paint the shadow. In some views, a 0
radius for the outline might be returned causing an exception when
painting the gradient. In those cases, simply disable the shadow.

Bug: http://b.android.com/207664
Change-Id: Idb937083d42ca02bbace843b881f61aa88fe47f2
(cherry picked from commit 5bc40214817fc6bd4ee541763d40522ae94f1d82)
2016-06-21 14:48:13 +00:00
Jerome Gaillard
301d468428 Incorporate alpha attribute when painting VectorDrawable
When painting a vector drawable, alpha transparency can come from
the path color, or from the overall android:alpha attribute.
Include both when drawing.

Bug: http://b.android.com/206667
Change-Id: Id946fdeaf72b981597787f5357ef3a90a471c584
(cherry picked from commit 8cae3b0ce6f527e7b90d46755ffaf6d3d4d65114)
2016-06-21 14:47:55 +00:00
Adam Lesinski
32852a575b AAPT2: Use hash map for StringPool indices
Hash map has better locality and average case performance

Change-Id: Ic2d111c3cff1d5c0e7e9cbe36714669e6508c275
2016-06-18 01:10:34 +00:00
Yorke Lee
0933cf3f15 Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am: f33af2285b am: 3d80871032
am: 11e3bf5d30

Change-Id: I6a99d04fd3f9fb229f532838350313169cec502a
2016-06-17 20:42:14 +00:00
Yorke Lee
11e3bf5d30 Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am: f33af2285b
am: 3d80871032

Change-Id: I2f7745317f6ae0932d7c16469b500847e465a912
2016-06-16 21:27:50 +00:00
Yorke Lee
3d80871032 Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b

Change-Id: I539f39cfea50f34dade2141829b21d422809b09f
2016-06-16 21:22:22 +00:00
Yorke Lee
599cf6bc4a Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b

Change-Id: If4d9abfb81929f8366fc9acc7978816d55117fbc
2016-06-16 21:21:57 +00:00
Yorke Lee
0e85247195 Limit global drags to apps targeting SDK 24 and above
Bug: 29127791

Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc
2016-06-16 09:35:40 -07:00
Roozbeh Pournader
8566f96668 Remove modifications to emoji data
The previous two changes, I60097cd78f28764d83abe0d12b53e2a7e6c974dc
and Idcc8f1b66014b25758c163d908d34f06011d9927, added code to filter
out two characters that were getting removed from the emoji set. Now
that the upstream Unicode data file removes them (see
Ibfea01280d08df34dcdd03f5121aabd532a6eecc), we can remove the code.

Bug: 26187231
Change-Id: Ib849917d8978da1b24fe5fff17d62ad7c2de963a
2016-06-15 13:23:01 -07:00
Adam Lesinski
5fcfdab573 Merge "Allow uses-library under <application>" into nyc-mr1-dev am: c878fb0cb8
am: b80680af78

* commit 'b80680af787dfb27e5a4b1b0edae8502373c4935':
  Allow uses-library under <application>

Change-Id: I078857ace29f7f35b9efbee99f4278b7c7ba9c9e
2016-06-03 00:44:51 +00:00
Adam Lesinski
b80680af78 Merge "Allow uses-library under <application>" into nyc-mr1-dev
am: c878fb0cb8

* commit 'c878fb0cb8a901aae71d965a57e75e682eb6f67f':
  Allow uses-library under <application>

Change-Id: Iaa1f6acb21ec2426a9b8e935efd71cd877bed667
2016-06-03 00:38:23 +00:00
Adam Lesinski
fee32d4d5f Allow uses-library under <application>
Bug:29106952
Change-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23
2016-06-02 23:57:55 +00:00
Diego Perez
64b185e49d Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: 9bb16a480d
am: 5e2de2eb12

* commit '5e2de2eb1221c9dafd260b42c732417cfc2b074f':
  Workaround to display menus for AppCompat themes

Change-Id: I5042125c7797c7534c0c83d2e7370d7c5f70be94
2016-05-25 17:32:33 +00:00
Alan Viverette
5e2de2eb12 Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c
am: 9bb16a480d

* commit '9bb16a480d00d8016f9c1969e136acfecceb802b':
  Workaround to display menus for AppCompat themes

Change-Id: I6fee3d4348e763f1e590b6e49740f3108b702b4e
2016-05-25 16:51:19 +00:00
Diego Perez
9bb16a480d Merge "Workaround to display menus for AppCompat themes" into nyc-dev
am: 36cd747bb6

* commit '36cd747bb6030c9c19dbab6bdfd85b2106017973':
  Workaround to display menus for AppCompat themes

Change-Id: I5af2f38a8c470c5aca89e91b951c45f7ae91ed3b
2016-05-25 16:47:47 +00:00
Diego Perez
6cc7426439 Merge "Workaround to display menus for AppCompat themes" into nyc-dev
am: 36cd747bb6

* commit '36cd747bb6030c9c19dbab6bdfd85b2106017973':
  Workaround to display menus for AppCompat themes

Change-Id: I65ce3798aa3fc2d851126d88b3dc1834d05b5393
2016-05-25 16:47:14 +00:00
Diego Perez
790e5f6c1c Workaround to display menus for AppCompat themes
Layoutlib currently does not implement menus for the support Toolbar.
When it detects that an AppCompat theme is being used, it will try to
use by default the support Toolbar which breaks the display of menus.
This works around the problem by forcing layoutlib
to use the framework toolbar in menu previews (regular activities
won't display the menu if they use AppCompat).

Bug: http://b.android.com/210946
Change-Id: Ic1d162c6d74119ef42895776c3bc3851a9549120
2016-05-24 18:27:35 +01:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Chih-Hung Hsieh
032dcff201 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 am: f55c9f7aa6
am: d5bb8487d5

* commit 'd5bb8487d58b168543d6504504d8e89e062a6b8b':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I779a9fe55406d460cedc1279e3c056e74787c5bb
2016-05-19 23:39:59 +00:00
Adam Lesinski
d5bb8487d5 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169
am: f55c9f7aa6

* commit 'f55c9f7aa64660712242705d4e5e89e2191bbf69':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I23f28430cf242be3f77926016626ea3e5705d4ec
2016-05-19 23:34:58 +00:00
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw.
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
2016-05-19 15:19:22 -07:00
Wale Ogunwale
fde6b69095 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717
am: f5a87d86bf

* commit 'f5a87d86bf08b564d2db00bf626092721e348e61':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
2016-05-17 01:10:44 +00:00
Wale Ogunwale
f5a87d86bf Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee
am: 33cffe3717

* commit '33cffe371778d21452fa5706d73f6dded29fb8de':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
2016-05-17 01:05:00 +00:00
Wale Ogunwale
273d6e8f56 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
2016-05-17 00:59:36 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Wale Ogunwale
3b23239d6e Fixed bugs with starting windows when displayng forcedResized activity
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.

Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Yohei Yukawa
7e4ef1a319 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 am: a1c905caf3
am: c7aeaff113

* commit 'c7aeaff113ab3c525bab5ad79fce05ae895d93a7':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I188b8ebb263d67c1bdcefcd4e9fedf390a199969
2016-05-16 15:37:39 +00:00
Yohei Yukawa
c7aeaff113 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5
am: a1c905caf3

* commit 'a1c905caf3fe89beec6df12b423c6cab33c40879':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: Ifbbbd96c2453a1aa6d933dda6fbd7ebbfdf132a7
2016-05-16 15:34:19 +00:00
Yohei Yukawa
a1c905caf3 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I76b607cd8086f421fc0d552a348a70fc06aa3d9c
2016-05-16 15:31:05 +00:00