Commit Graph

14153 Commits

Author SHA1 Message Date
Tyler Gunn
d6d8745bb2 Add support for dropping fg video call on answer of audio call. am: 4b6614e576
am: b90e2dc722

Change-Id: I09a322e50a6989375f2ba1ec4a81b2fb0ee8876b
2016-06-23 20:52:30 +00:00
Tyler Gunn
b90e2dc722 Add support for dropping fg video call on answer of audio call.
am: 4b6614e576

Change-Id: Id51de6ca0d6f885a22374e2a2c0a38477a5e2df7
2016-06-23 20:21:09 +00:00
Tyler Gunn
4b6614e576 Add support for dropping fg video call on answer of audio call.
Adding two new carrier config options:
1. treat_downgraded_video_calls_as_video_calls_bool - when there is an ongoing
call which was previously a video call (or is currently video call), some
carriers require that this is treated as if it is a video call for
telephony logic such as in (2).
2. drop_video_call_when_answering_audio_call_bool - if the user is in an
active video call (see (1)) over wifi, and an incoming audio call comes in,
when this carrier config option is "TRUE", the video call will be dropped
when the audio call is answered.

Adding new connection extra to indicate to the dialer app that answering
a ringing call will cause the current active video call to drop.

Bug: 29275420
Change-Id: Ied5dbabc8ff09045ba41c5eba2136adad10db80e
2016-06-23 12:48:43 -07:00
Andrew Sapperstein
7fe3adcf26 Merge \"Merge \\"Add colorSecondary theme attribute.\\" into nyc-mr1-dev am: ddb980de05\" into nyc-mr1-dev-plus-aosp
am: cd10a1fce1

Change-Id: I645b91c902e1772b40a42b10504316990ef74ae6
2016-06-23 19:09:33 +00:00
Andrew Sapperstein
d861ae9847 Merge \"Add colorSecondary theme attribute.\" into nyc-mr1-dev
am: ddb980de05

Change-Id: I4da850a2d146ed594ac76e66b34e367dac03b821
2016-06-23 18:44:57 +00:00
Andrew Sapperstein
ddb980de05 Merge "Add colorSecondary theme attribute." into nyc-mr1-dev 2016-06-23 18:37:42 +00:00
Ta-wei Yen
3bfaeb7c6f Merge \\"Add more configuration state for visual voicemail\\" into nyc-mr1-dev am: fbb87a0591
am: 6b4c1e2d9b

Change-Id: Ic927f2b9a0ef6e55614bd6ea7b62793a6d10bf36
2016-06-23 02:41:07 +00:00
Ta-wei Yen
6b4c1e2d9b Merge \"Add more configuration state for visual voicemail\" into nyc-mr1-dev
am: fbb87a0591

Change-Id: I2e1e11c5ef9ec8a166d232efd4f167de6a4d55f2
2016-06-23 02:35:38 +00:00
Ta-wei Yen
fbb87a0591 Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev 2016-06-23 02:28:24 +00: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
Ta-wei Yen
1121017213 Add more configuration state for visual voicemail
Bug: 26944391
Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133
2016-06-22 17:48:52 -07:00
Jim Miller
f0db3158fb Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641
am: 0a7efa1e47

Change-Id: Id8de76d28e581f5a4fa448dd48dc33870d81b538
2016-06-23 00:25:06 +00:00
Jim Miller
0a7efa1e47 Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev
am: 0520091641

Change-Id: I285f751bd449c89685a88ad30073cd011dfe5061
2016-06-23 00:20:57 +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
      152944f490
 [2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
      adebb52588

Bug: 29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
2016-06-22 16:31:41 -07:00
Jim Miller
07e0384a4e Enable fingerprint sensor navigation to invoke QuickSettings
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"

Fixes bug 28869612

Change-Id: I321240ee54506633d63a29e987b8d8638c652391
2016-06-22 15:18:13 -07:00
Makoto Onuki
02f355df6b Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp
am: 24c52732d7

Change-Id: Ib54aff79c823b6819d94ef0ef6194e4541bf734f
2016-06-22 00:55:32 +00:00
Yorke Lee
c502ca33ed Merge \\\"Tweaks to DragAndDropPermissions behavior\\\" into nyc-dev am: 22faa5ddb1 am: 072ce0c29c
am: bf18ee7b76

Change-Id: Ib9dc30baa67a137749b2cb6bafe5ccb0de48d769
2016-06-21 23:56:51 +00:00
Makoto Onuki
5665a66b44 Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev
am: 3c67b3e47c

Change-Id: If7346f3dea63a31592d430b7503af170cb354677
2016-06-21 23:50:32 +00:00
Yorke Lee
bf18ee7b76 Merge \\"Tweaks to DragAndDropPermissions behavior\\" into nyc-dev am: 22faa5ddb1
am: 072ce0c29c

Change-Id: Iee2afec7bd3b6d6a81ce179df9e52a9e20bc1b72
2016-06-21 23:37:51 +00:00
Android Build Merger (Role)
4d46efc084 Merge "Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev am: 22faa5ddb1" into nyc-mr1-dev 2016-06-21 23:37:00 +00:00
Yorke Lee
d22536666a Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
am: 22faa5ddb1

Change-Id: Ia37191b026b85773d27b41b7991238a07e141a12
2016-06-21 23:35:09 +00:00
Makoto Onuki
b5a012fd6f Shortcut Manager: Address API council feedback and fix TODOs
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088

Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
2016-06-21 14:42:48 -07:00
Yorke Lee
072ce0c29c Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
am: 22faa5ddb1

Change-Id: Icbe2a2b78d19dbdf067aa69a2e0c539a809893aa
2016-06-21 21:20:11 +00:00
Andrew Sapperstein
c11df2521e Add colorSecondary theme attribute.
Value is defined only for .Settings themes.

Uses new attribute in SystemUI to set the switch bar background in
System UI Tuner and the edit UI background in Quick Settings.

BUG: 28625050
Change-Id: I840597670fb8826c7e2172c933ff618e52fc9ac1
FIXES: 28625105
FIXES: 29003223
2016-06-21 13:41:02 -07:00
Yorke Lee
c8ad0cd316 Tweaks to DragAndDropPermissions behavior
No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.

Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.

Bug: 29162822

Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896
2016-06-21 12:57:52 -07:00
Sanket Padawe
a073a5261e Merge \\"Unhide Network types in TelephonyManager\\" into nyc-mr1-dev am: 0df9721a08
am: ac9cfbf548

Change-Id: I68771c36a436f6ccaaacc959604c6e416af8ee96
2016-06-21 17:25:21 +00:00
Sanket Padawe
ac9cfbf548 Merge \"Unhide Network types in TelephonyManager\" into nyc-mr1-dev
am: 0df9721a08

Change-Id: I967f047882ef07aa8d5deb88a5ad379a3b37257d
2016-06-21 17:17:58 +00:00
Sanket Padawe
0df9721a08 Merge "Unhide Network types in TelephonyManager" into nyc-mr1-dev 2016-06-21 16:56:24 +00:00
Sanket Padawe
4652826d71 Unhide Network types in TelephonyManager
Bug: 29493935
Change-Id: Ib1bef4a68a962b0f473e07415d46ecff6080ea71
2016-06-20 12:40:07 -07:00
Yohei Yukawa
045de3f08c Merge \\"API Rename: IC#inputContent to IC#commitContent.\\" into nyc-mr1-dev am: 01e7c10d37
am: 0d7dcf7bc3

Change-Id: I5c4209a79e7426192da082100ac2a7517de36b81
2016-06-17 23:38:28 +00:00
Yohei Yukawa
0d7dcf7bc3 Merge \"API Rename: IC#inputContent to IC#commitContent.\" into nyc-mr1-dev
am: 01e7c10d37

Change-Id: I5aa903ee453a3945d3f2710d2b6734443fcbd972
2016-06-17 23:31:12 +00:00
Yohei Yukawa
01e7c10d37 Merge "API Rename: IC#inputContent to IC#commitContent." into nyc-mr1-dev 2016-06-17 23:23:59 +00:00
Jack Yu
f9529b5a48 Merge "Added a new configuration for data call setup permanent failure" 2016-06-17 22:02:51 +00:00
Makoto Onuki
cb0f366fe2 Merge \\"Update manifest shortcut XML schema\\" into nyc-mr1-dev am: a65d8b6609
am: 5a533c9ae3

Change-Id: If46b8c1763b3682c780dcbaef1a790c1a5b9ded6
2016-06-17 21:51:37 +00:00
Makoto Onuki
5a533c9ae3 Merge \"Update manifest shortcut XML schema\" into nyc-mr1-dev
am: a65d8b6609

Change-Id: I7f7b88bb468e608e28ecb2af3b2455ae75e812af
2016-06-17 20:40:16 +00:00
Makoto Onuki
df6da040e0 Update manifest shortcut XML schema
Use the standard <intent> tag instead of custom tags.

- Also fix setDynamicShortcuts(), which was broken in the previous CL.
- Also tolerate runtime exceptions while parsing XMLs
- Also fix b/29422018 while I'm at it

Bug 29390156
Bug 29077932
Bug 29422018

Change-Id: I2756c9d66c6d7b2962a982d9e57a7d84a5755b28
2016-06-17 11:51:20 -07:00
Jack Yu
8a81a21777 Added a new configuration for data call setup permanent failure
bug: 28728821
Change-Id: I441df1483dfa3d4bc1ea566a98b17bd3deddc193
2016-06-17 10:37:37 -07:00
Yohei Yukawa
adebb52588 API Rename: IC#inputContent to IC#commitContent.
As shown in below, we have already used commit* naming convention in
InputConnection.

 - InputConnection#commitCompletion(CompletionInfo);
 - InputConnection#commitCorrection(CorrectionInfo);
 - InputConnection#commitText(CharSequence, int);

Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.

Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
2016-06-17 10:10:39 -07:00
Donghyun Cho
16a630d945 Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata" 2016-06-17 02:03:14 +00:00
Yi Kong
158ef35824 Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am: 53cf79e185
am: 75aee6f266

Change-Id: I30a3bc53262cc1f27b3c745af2a9b6a4d6357649
2016-06-16 16:33:13 +00:00
Yi Kong
75aee6f266 Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc-dev-plus-aosp
am: 53cf79e185

Change-Id: I7444bfc95144d4d00c20347512a5a5fc0cceebc8
2016-06-16 16:21:03 +00:00
Yi Kong
53cf79e185 Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp 2016-06-16 16:17:49 +00:00
Yi Kong
ade5c7c893 Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit af823e0ebf)
2016-06-16 17:14:36 +01:00
Przemyslaw Szczepaniak
81368e08e0 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am: 7d09db2830

Change-Id: I57f72e630688d91ca56adfb910232358746777e0
2016-06-16 16:07:49 +00:00
Przemyslaw Szczepaniak
7d09db2830 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
(cherry picked from commit aa021e854e)
2016-06-16 15:58:27 +00:00
Przemyslaw Szczepaniak
aa021e854e Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
2016-06-16 15:15:17 +01:00
Joachim Sauer
020a748bcc Merge \\\\"API updated for ICU4J 57.1\\\\" am: 4861329f57 am: 438dc91a41 am: 69147f24ae
am: 3ac8348d00

Change-Id: I811b6eabe9587c704afac941bbf1385798f7957b
2016-06-16 13:17:47 +00:00
Fredrik Roubert
3ac8348d00 Merge \\\"API updated for ICU4J 57.1\\\" am: 4861329f57 am: 438dc91a41
am: 69147f24ae

Change-Id: Ic62119248aeef08141a3f6a9b2d948529997cbcc
2016-06-16 13:12:13 +00:00