Commit Graph

50054 Commits

Author SHA1 Message Date
Raph Levien
06e380644e am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
* commit '1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
  Respect style boundaries when measuring text
2015-07-21 17:04:30 +00:00
Raph Levien
1fcb6d3ae2 Merge "Respect style boundaries when measuring text" into mnc-dev 2015-07-21 16:55:39 +00:00
Raph Levien
ea2b4a40f7 Respect style boundaries when measuring text
The existing implementation of handleText() in TextLine laid out
text to the end of the context. However, in cases where the text is
broken into multiple style spans, it's only valid to lay out up to
the end of the style span. This can lead to inconsistent
measurements, especially in the presence of legitimate zero-width
characters such as bidi control characters and zero width space.

This patch changes the invocation of getRunAdvance to measure only
within the style span.

Bug: 22589743
Change-Id: I027f5e77db27ddf9596ef20adcad7e62a82b41de
2015-07-20 16:22:01 -07:00
Alan Viverette
7e79319308 am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
* commit '001f1e7eb35630df24d53298c1a3d2de055d7ce9':
  Add missing invalidation check to drawable cache
2015-07-20 22:59:53 +00:00
Dianne Hackborn
ac00dd8b36 am a7ce2344: Merge "Fix issue #22564918: Request is inactive" into mnc-dev
* commit 'a7ce23440328e63f36a4add05199aa84ff04032d':
  Fix issue #22564918: Request is inactive
2015-07-20 22:45:21 +00:00
Alan Viverette
001f1e7eb3 Merge "Add missing invalidation check to drawable cache" into mnc-dev 2015-07-20 22:44:47 +00:00
Dianne Hackborn
a7ce234403 Merge "Fix issue #22564918: Request is inactive" into mnc-dev 2015-07-20 22:34:49 +00:00
Dianne Hackborn
1b4447f728 Fix issue #22564918: Request is inactive
Add Request.isActive() API.  Also improve documentation to tell
people what things cause it to become inactive.  And fix a race
where we were modifying the active list from outside the main
thread without locking it.

Change-Id: I9248e014126cb121612edbe595108ace753456e2
2015-07-20 14:49:58 -07:00
Roozbeh Pournader
96f75efa9f am 2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
* commit '2dc6ebbea8a72e90bc66cac84b15ae3ce5898536':
  Fix default value of stereoReset() in the documentation.
2015-07-20 21:24:01 +00:00
Keisuke Kuroyanagi
e97602ac2f am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
* commit '437eb6ce483a34e28c06d70c0b408ba4a495293a':
  Fix: Wrong suggestion popup position in extract mode.
2015-07-20 21:23:54 +00:00
Roozbeh Pournader
2dc6ebbea8 Merge "Fix default value of stereoReset() in the documentation." into mnc-dev 2015-07-20 21:20:02 +00:00
Keisuke Kuroyanagi
437eb6ce48 Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev 2015-07-20 21:12:38 +00:00
Roozbeh Pournader
0571c02dc5 am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
* commit '9bdb7bfd35a4b1faa5cbafeb3f1e20ff34e7b0e1':
  Bidi-wrap the results of format[Short]FileSize().
2015-07-20 20:40:54 +00:00
Roozbeh Pournader
9bdb7bfd35 Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev 2015-07-20 20:30:39 +00:00
Dianne Hackborn
86e56bb371 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
2015-07-20 20:04:26 +00:00
Alan Viverette
7ef1e773fd Add missing invalidation check to drawable cache
Bug: 22478448
Change-Id: Ic9da1898cd921d8c133ef5397fc97a664601a863
2015-07-20 16:03:04 -04:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled...
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
2015-07-20 12:49:10 -07:00
Ricardo Garcia
d199589b7e am 2dcfc7a9: Merge "Fix for MidiManager bug" into mnc-dev
* commit '2dcfc7a9972de3abfebdf2d84bcba0095e4fbae5':
  Fix for MidiManager bug
2015-07-20 18:45:13 +00:00
Billy Lau
ffdd2e85e4 am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
* commit '072e04a7f1a167dc653b5bcca4876fecfdb4f6be':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
2015-07-20 18:04:19 +00:00
Ricardo Garcia
2dcfc7a997 Merge "Fix for MidiManager bug" into mnc-dev 2015-07-20 18:03:45 +00:00
Billy Lau
072e04a7f1 Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 2015-07-20 17:57:30 +00:00
Billy Lau
24b9c8314b Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
2015-07-20 18:36:39 +01:00
Roozbeh Pournader
007262e0ae Fix default value of stereoReset() in the documentation.
The default has been 'true' for eternity in the code. But the
documentation was mistakenly saying it was 'false'. Going with the
code, since there are people out there relying on the code continuing
to work the same way.

Bug: 22557371
Change-Id: I6f4e7b2052d0cc30d41e8ccf2b9a5c6111fa0ab7
2015-07-20 10:08:58 -07:00
Keisuke Kuroyanagi
fd3eff27bd Fix: Wrong suggestion popup position in extract mode.
Replace text was handled by the original EditText; thus, we
couldn't correctly decide popup window position.
Also, changing selection range replaces entire text of the
extracted EditText. As a result, text cannot be replaced
with the selected item when there is a selection.

This change is a workaround for this issue. This quits
offering "Replace" for selection in extract mode.

Bug: 22038802
Change-Id: I052b027cfd10eeb289f77f4c6b228acf58fea636
2015-07-17 16:36:57 -07:00
Chet Haase
f5f85001c8 am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev
* commit 'd3f327be2d1f8facd709895f2d05757351e8be07':
  Localize SimpleMonthView
2015-07-17 23:31:34 +00:00
Chet Haase
d3f327be2d Merge "Localize SimpleMonthView" into mnc-dev 2015-07-17 23:28:15 +00:00
Chet Haase
1ea4715cec Localize SimpleMonthView
The days of the month were not being localized, resulting in
English numbers for non-English languages. Now we format the numbers
with the current locale.

Issue #22540629  [MRA14D][Arab][Token] numbers displayed in english

Change-Id: I2b17d55ba2d0aa47b5a28c8846c6cf9723ababb1
2015-07-17 14:26:17 -07:00
Roozbeh Pournader
8d2e0f7898 Bidi-wrap the results of format[Short]FileSize().
Previously, users of the results of formatFileSize() and
formatShortFileSize() needed to unicodeWrap the results themselves
using BidiFormatter, which resulted in several bugs and
inconsistencies across the platform when they didn't, especially in
Hebrew and Urdu locales:

Hebrew and Urdu use Latin abbreviations like 'MB' for file sizes
which cause undesired reorderings (or incorrect detection of the
string direction when the formatted file size starts the string).

With this patch, the results are now bidi-wrapped before being
returned if the locale of the context passed in to the formatter is a
right-to-left locale.

Bug: 22237132
Bug: 22273176
Change-Id: If076636d15828fc810feef6f0fa8806ef52aed5d
2015-07-17 12:02:22 -07:00
Tingting Wang
a14b03392b am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit 'ad359f2e705280e26198890a95d53e3566126bcc':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
2015-07-17 18:31:28 +00:00
Tingting Wang
ad359f2e70 Merge "Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 2015-07-17 18:19:56 +00:00
Chien-Yu Chen
6dfe05b27d am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit 'aa9a27bb9bbfb4bccf999a0d453f4f4d853aac36':
  Camera2: Update FAST mode for EE and NR
2015-07-17 17:05:33 +00:00
Eino-Ville Talvala
e09a78d365 am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
* commit '6e8a551f9f7691e3d7ada46eeae5d2cc612d7938':
  Camera2: Add hidden experimental tearDown method
2015-07-17 17:05:20 +00:00
Chien-Yu Chen
aa9a27bb9b Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 2015-07-17 17:01:30 +00:00
Eino-Ville Talvala
6e8a551f9f Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 2015-07-17 16:54:09 +00:00
Nancy Chen
e2f7ef741b am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev
* commit '660322d8259cb256745f15219af0b9004063ea8d':
  Add transcription field to voicemail object and related changes.
2015-07-17 16:51:30 +00:00
Nancy Chen
660322d825 Merge "Add transcription field to voicemail object and related changes." into mnc-dev 2015-07-17 16:37:43 +00:00
Neil Fuller
04405925c7 resolved conflicts for merge of 71165ea6 to mnc-dev-plus-aosp
Change-Id: I5fb6eb3ee12318a575a5cd9faa8c8d2c98efa7bd
2015-07-17 11:49:27 +01:00
Neil Fuller
7ce3847d75 Merge "Migrate Resources.java to use ICU4j drectly." 2015-07-17 10:09:25 +00:00
Selim Cinek
c4d09707e3 am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
* commit 'b43b06d1056031444596edcc27a1a10084e5cad3':
  Fixed a bug where notifications were not posted on secondary users
2015-07-17 01:40:00 +00:00
Nancy Chen
5bd3e73a21 Add transcription field to voicemail object and related changes.
Bug: 22542002
Change-Id: I05c18e8f82a4f318fb59228e4d6eb844d64bee30
2015-07-16 18:36:58 -07:00
Selim Cinek
b43b06d105 Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 2015-07-17 01:31:31 +00:00
Ricardo Garcia
47abda576e Fix for MidiManager bug
Returning null if MidiManager service can't be created instead
of crashing with NPE.

bug: 22087661
Change-Id: Ia27835ea1197af2db04c3e7f1d2e7c9f32fddbd0
2015-07-16 18:20:46 -07:00
Dan Sandler
45b281298d am 86647987: Icon-related Notifications API changes:
* commit '86647987c3c6bf4e6a8bacd763ff16f1806c70a3':
  Icon-related Notifications API changes:
2015-07-17 01:10:37 +00:00
Dan Sandler
86647987c3 Icon-related Notifications API changes:
- Deprecate Notification.icon and largeIcon.
    setSmallIcon(Icon) and setLargeIcon(Icon) should be used
    instead.
  - Add Icon support to Notification actions; deprecate
    Action.icon and methods/ctors that use int.

Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
2015-07-17 00:59:20 +00:00
Adam Powell
0cad2b6006 am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle
2015-07-17 00:33:59 +00:00
Adam Powell
9ba039bbe9 Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 2015-07-17 00:25:11 +00:00
Selim Cinek
f33b11182a Fixed a bug where notifications were not posted on secondary users
Unfortunately they made sound though, driving people crazy.

Bug: 22351758
Change-Id: I9ec5bac97c2d587c4e356ab759876def3369b11a
2015-07-16 17:24:51 -07:00
Svet Ganov
2264842f71 am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
* commit '6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
  Improve documentation of onRequestPermissionsResult
2015-07-17 00:04:53 +00:00
Svet Ganov
6f561a24c9 Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 2015-07-16 23:51:53 +00:00