Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
271,079 Commits 3 Branches 0 Tags
0102f445ceecfc074f537589e66bfc7c552f23da
Commit Graph

14178 Commits

Author SHA1 Message Date
TreeHugger Robot
57a289865b Merge "Make getTransition a @TestApi for CTS tests." 2016-06-24 21:46:58 +00:00
George Mount
f239f99113 Make getTransition a @TestApi for CTS tests. 
Bug 29570647

Change-Id: I85b2b215fbad2ca72e67b17a29cc9b122ae5945e
 2016-06-24 11:53:42 -07:00
Yi Kong
dc13e467f0 Merge \\\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\\" into stage-aosp-master am: a725dbd6c7 am: 79f65e5d67 
am: a5f5a0ec51

Change-Id: Ifc906ae9d7e23b86397ab425b04309897803b45a
 2016-06-24 17:11:27 +00:00
Yi Kong
a5f5a0ec51 Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage-aosp-master am: a725dbd6c7 
am: 79f65e5d67

Change-Id: I02446be0c5ce1840dcb21b4019b7a02cf0bee3f5
 2016-06-24 17:01:06 +00:00
Yi Kong
79f65e5d67 Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master 
am: a725dbd6c7

Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc
 2016-06-24 16:55:38 +00:00
Yi Kong
a725dbd6c7 Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master 2016-06-24 16:47:31 +00:00
Przemyslaw Szczepaniak
f4c09099ea Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06 am: 3606de0fb4 
am: 9dcaf12623

Change-Id: Ifa23e2d020195c326fd41889bb9ffc5186db7617
 2016-06-24 12:02:23 +00:00
Przemyslaw Szczepaniak
9dcaf12623 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06 
am: 3606de0fb4

Change-Id: I65867f77e21821fdcd62247bf242def4807f09dd
 2016-06-24 11:58:07 +00:00
Przemyslaw Szczepaniak
3606de0fb4 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a 
am: ab3d167f06

Change-Id: Ie65f8c8d85ea689c210a40b3ee6373c146488cd1
 2016-06-24 11:53:57 +00:00
Przemyslaw Szczepaniak
a0ba0fb7eb Merge \\\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\\" am: 36ce097dbb am: 12bb15c1d3 am: 387191bc64 
am: 89d16125be

Change-Id: Ife2190fa27996f78152e2bbe0fbb0649ac969acf
 2016-06-24 11:42:22 +00:00
Przemyslaw Szczepaniak
89d16125be Merge \\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am: 36ce097dbb am: 12bb15c1d3 
am: 387191bc64

Change-Id: I4bede82fd01c3a80a67dadf545e9ffdc1ab7c8e0
 2016-06-24 11:38:01 +00:00
Przemyslaw Szczepaniak
387191bc64 Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: 36ce097dbb 
am: 12bb15c1d3

Change-Id: I5a44a8a58c0f90396c95755e919c05fdd500a3cd
 2016-06-24 11:33:42 +00:00
Przemyslaw Szczepaniak
ab3d167f06 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a 
version with test-current.txt

Bug: 28666126
Change-Id: Ib97b5124e0cf28370b0deee81306e761c9bf9059
 2016-06-24 11:33:27 +00:00
Przemyslaw Szczepaniak
12bb15c1d3 Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\" 
am: 36ce097dbb

Change-Id: Ida8dcbbd72df17bbcc49bbccc0cec562d4a6a0e7
 2016-06-24 11:23:01 +00:00
Przemyslaw Szczepaniak
18d9fb485c Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a 
This change reverts previous fix for b/27582395 and makes
AbstractStringBuffer an Appendable. 

Bug: 28666126
Bug: 27582395 
Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b
 2016-06-24 10:53:06 +00:00
Yi Kong
88b878505e Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259 
Bug: 29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
(cherry picked from commit fdbf33126e)
 2016-06-24 11:15:33 +01:00
Dmitri Plotnikov
abcc4392e9 Merge \\"Unhiding DEVICE_NAME\\" into nyc-mr1-dev am: b1ca092db8 
am: 89858c58af

Change-Id: Id7ccc6d627574bb1a1d0198f72ab70f921d8c9d9
 2016-06-24 00:37:57 +00:00
Dmitri Plotnikov
89858c58af Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev 
am: b1ca092db8

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0
 2016-06-24 00:32:44 +00:00
Dmitri Plotnikov
b1ca092db8 Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev 2016-06-24 00:23:13 +00:00
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
Dmitri Plotnikov
f19b6ec8bb Unhiding DEVICE_NAME 
Bug: 28439637
Change-Id: Iea9efbaf18b2110c21f0d27a3e44fd6590f2d372
 2016-06-21 16:22:56 -07: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