Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,191 Commits 3 Branches 0 Tags
0571c02dc5c22c595c3140ee0552d31451bc764f
Commit Graph

54574 Commits

Author SHA1 Message Date
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
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
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
Dianne Hackborn
9631113672 am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '5c269121d8ea0bf3f530f2314695e189ffdb3165':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:18:09 +00:00
Dianne Hackborn
5c269121d8 Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-07-17 22:03:46 +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
Dianne Hackborn
f38c4ee903 Work on issue #22556778: Starting under voice control not allowed 
The ResolverActivity is voice capable.  In fact, it is capable
of EVERYTHING.

Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
 2015-07-17 11:21:26 -07: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
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle 
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
 2015-07-16 16:29:59 -07:00
Svet Ganov
0f45c7c7c4 Improve documentation of onRequestPermissionsResult 
bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
 2015-07-16 16:29:04 -07:00
Svet Ganov
f10d7708ca am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:25:16 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Eino-Ville Talvala
14c09fa3c5 Camera2: Add hidden experimental tearDown method 
Bug: 18949148
Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
 2015-07-16 14:55:26 -07:00
Dianne Hackborn
628d4653d4 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:14 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Tingting Wang
86ac228143 Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1." 
This reverts commit d55b348e62.

Change-Id: I3e623de725c419489294aed6c3b3aea838fc0f7b
 2015-07-16 21:19:28 +00:00
Svet Ganov
f1be07928e am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:26:05 +00:00
Svet Ganov
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00
Dianne Hackborn
a7cfbe0e54 Work on issue #22516282: ChooserTarget URI grants not forwarded 
Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307
 2015-07-16 10:52:52 -07:00
Svet Ganov
9e136b88ba Return a result from Fragment#shouldShowRequestPermissionRationale 
bug:22523342

Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
 2015-07-16 09:58:43 -07:00