Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,160 Commits 3 Branches 0 Tags
10aee22fa1dd5563da6493fdc8e2faeb89d7a7ce
Commit Graph

261160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
10aee22fa1 Merge "Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379 am: 8c9bd9cb28" into nyc-mr1-dev-plus-aosp 2016-06-23 22:10:52 +00:00
Scott Main
afd1e8e259 Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379 
am: 8c9bd9cb28

Change-Id: I557f9300ab69486a26f30bed5a244baee43319e7
 2016-06-23 22:10:29 +00:00
Roozbeh Pournader
345f70e949 Merge \"Revert \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\"\" into nyc-mr1-dev 
am: 60882f517d

Change-Id: Ic0efed4a1c500fe021ee4244708bcda99f91f68e
 2016-06-23 22:09:03 +00:00
smain@google.com
8c9bd9cb28 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev 
am: fd0eeb0379

Change-Id: I3662c41848c20bfde90dcd453917e67f93693e74
 2016-06-23 22:05:07 +00:00
Android Build Merger (Role)
fe103d3ea6 Merge "Merge \"Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063\" into nyc-mr1-dev am: 1ecbced5cb" into nyc-mr1-dev-plus-aosp 2016-06-23 21:59:27 +00:00
Android Build Merger (Role)
a5b7b96500 Merge "Merge \"Print names of observers causing timeout\" into nyc-mr1-dev am: 38d7897690" into nyc-mr1-dev-plus-aosp 2016-06-23 21:59:21 +00:00
Roozbeh Pournader
60882f517d Merge "Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]""" into nyc-mr1-dev 2016-06-23 21:58:57 +00:00
Min Yun
566ef84677 Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063 
am: 09190840e0

Change-Id: I298d4f7b684aaa2e0b967fbbadcb72e37fa41ce3
 2016-06-23 21:58:54 +00:00
Min Yun
97fa15c127 Merge \"Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063\" into nyc-mr1-dev 
am: 1ecbced5cb

Change-Id: If62b270ca54aeca613115ea90b88d32a048bdd95
 2016-06-23 21:58:43 +00:00
Fyodor Kupolov
7ccd3241e0 Merge \"Print names of observers causing timeout\" into nyc-mr1-dev 
am: 38d7897690

Change-Id: I45f06a2167e11733829c660c7baaae3996d8c7eb
 2016-06-23 21:58:36 +00:00
Scott Main
fd0eeb0379 Merge "fix bad contrast in table links by switching to normal table cells instead of headings." into nyc-dev 2016-06-23 21:57:52 +00:00
Min Yun
09190840e0 Merge \"Fix guts are not bound properly.\" into nyc-dev 
am: 9ea3916063

Change-Id: I4335a5f347e4cbac21e34b64435fda4421235d31
 2016-06-23 21:53:12 +00:00
Android Build Merger (Role)
1ecbced5cb Merge "Merge \"Fix guts are not bound properly.\" into nyc-dev am: 9ea3916063" into nyc-mr1-dev 2016-06-23 21:50:15 +00:00
Min Yun
f03046aa20 Merge \"Fix guts are not bound properly.\" into nyc-dev 
am: 9ea3916063

Change-Id: I3adc7f367792e30bdf61067ea367436a22ef5842
 2016-06-23 21:49:55 +00:00
Fyodor Kupolov
38d7897690 Merge "Print names of observers causing timeout" into nyc-mr1-dev 2016-06-23 21:49:05 +00:00
TreeHugger Robot
9ea3916063 Merge "Fix guts are not bound properly." into nyc-dev 2016-06-23 21:45:59 +00:00
Adrian Roos
373b8d8f24 Merge \"Merge \\"HUN: Close RemoteInputView when Home is pressed\\" into nyc-dev am: cdd43d7270\" into nyc-mr1-dev 
am: 0cacb14c4e

Change-Id: I66281c7bd349cbff3b0bb4bda6859744a5e2cbb4
 2016-06-23 21:41:20 +00:00
Lajos Molnar
9a07a09df6 Merge \"Merge \\"media: update getAchievableFrameRatesFor javadoc\\" into nyc-dev am: 8fe82686ef\" into nyc-mr1-dev 
am: 5bebba2124

Change-Id: I8cc3ede6d87db8625ae8d0a3aa4ffb657c53e700
 2016-06-23 21:41:17 +00:00
Chong Zhang
fac7476990 Merge \"Do not send unhandled system config changes to app\" into nyc-mr1-dev 
am: 568507abf5

Change-Id: I4a711464f49c44f329e51d781dbe0eb4886d9c98
 2016-06-23 21:41:12 +00:00
Adrian Roos
2f3476de3e Merge \\"HUN: Close RemoteInputView when Home is pressed\\" into nyc-dev am: cdd43d7270 
am: 1a215e8f9b

Change-Id: I568001fbd23283f5cbf3a120a61dae570377b94a
 2016-06-23 21:37:23 +00:00
Lajos Molnar
1e34345c89 Merge \\"media: update getAchievableFrameRatesFor javadoc\\" into nyc-dev am: 8fe82686ef 
am: a4b5454f73

Change-Id: I7956d4b3124da0ee9a5f9c176f1b44b877fe162f
 2016-06-23 21:37:21 +00:00
Android Build Merger (Role)
0cacb14c4e Merge "Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev am: cdd43d7270" into nyc-mr1-dev 2016-06-23 21:34:39 +00:00
Android Build Merger (Role)
5bebba2124 Merge "Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev am: 8fe82686ef" into nyc-mr1-dev 2016-06-23 21:34:32 +00:00
Adrian Roos
86315e78ae Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev 
am: cdd43d7270

Change-Id: Id463ad12a2e302e869e504a95664d1dab89f793f
 2016-06-23 21:34:03 +00:00
Lajos Molnar
f39052574d Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev 
am: 8fe82686ef

Change-Id: I5c30373ad5d6eed29e953a81e89d60a6c649089b
 2016-06-23 21:34:00 +00:00
Adrian Roos
1a215e8f9b Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev 
am: cdd43d7270

Change-Id: I8b937034ffcf5e9c7d4caf30ba8325e882cf6564
 2016-06-23 21:33:55 +00:00
Chong Zhang
568507abf5 Merge "Do not send unhandled system config changes to app" into nyc-mr1-dev 2016-06-23 21:33:55 +00:00
Lajos Molnar
a4b5454f73 Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev 
am: 8fe82686ef

Change-Id: I7eac5a104c11d6176d0b8c5469e9a35b36e5cdc4
 2016-06-23 21:33:51 +00:00
TreeHugger Robot
cdd43d7270 Merge "HUN: Close RemoteInputView when Home is pressed" into nyc-dev 2016-06-23 21:26:34 +00:00
TreeHugger Robot
8fe82686ef Merge "media: update getAchievableFrameRatesFor javadoc" into nyc-dev 2016-06-23 21:25:33 +00:00
Android Build Merger (Role)
b1f926bd40 Merge "Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0 am: 9981d94d54" into nyc-mr1-dev-plus-aosp 2016-06-23 21:08:27 +00:00
Jason Monk
30b17f0bb6 Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0 
am: 9981d94d54

Change-Id: Id4e4b3bd53c9499f13c6d66a94cfd4aad9fa86b8
 2016-06-23 21:07:54 +00:00
Jason Monk
1ae5fbb187 Merge \\"QS: Hacks to fix bigger problems in TileService binding\\" into nyc-dev am: 1427bb3dc0 
am: 955de27827

Change-Id: I54da9edd0593160ee38002cb2d97c64248a9ed96
 2016-06-23 21:07:50 +00:00
Jason Monk
9981d94d54 Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev 
am: 1427bb3dc0

Change-Id: I471055cbac21c09d23b60e6dab15bcc1cd1d6208
 2016-06-23 21:02:13 +00:00
Jason Monk
955de27827 Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev 
am: 1427bb3dc0

Change-Id: I9b5e57c302b6ae0f6accccf65b5e404a1ad780c0
 2016-06-23 21:00:19 +00:00
Jason Monk
1427bb3dc0 Merge "QS: Hacks to fix bigger problems in TileService binding" into nyc-dev 2016-06-23 20:52:50 +00:00
Chong Zhang
4951f9d6f6 Do not send unhandled system config changes to app 
If the config change is system-level and the app doesn't handle
it, it will definitely get relaunched and we don't need to call
onConfigurationChanged.

bug: 29367672
Change-Id: I3193d4b63d316295c9e73d42d000ab4eb5c1a6ad
 2016-06-23 20:27:53 +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
Roozbeh Pournader
51a760a0f2 Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"" 
This reverts commit ad48dc18a5. sr-Latn is no
longer planned for MR1.

Bug: 29455508
Bug: 29601930
Change-Id: I1922ef649aab36be6ba3b94e3fd79a71a14acdff
 2016-06-23 20:01:01 +00:00
Min Yun
175559a28b Fix guts are not bound properly. 
When binding importance to guts, applying findViewById
to ExpandableNotificationRow of group's parents could
cause to return the reference of child notications's guts
which also has the same id. As a result guts are
not bound properly, and show weird guts.

Fixes: 29452827
Change-Id: Iaf8ee74b988bf41680857e9c3c3ae9e3bd8e4e1b
 2016-06-23 19:53:11 +00:00
Adrian Roos
07215350f9 HUN: Close RemoteInputView when Home is pressed 
CLOSE_SYSTEM_DIALOGS usually dismisses the notification shade,
but that's not the case for HUNs because the shade is not actually
open. However, CLOSE_SYSTEM_DIALOGS will now close the Direct Reply
even with HUNs.

Change-Id: If8e5115e33f93db0f8b4e442331ea3d60fc0c63d
Fixes: 29583313
 2016-06-23 12:51:38 -07: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
Android Build Merger (Role)
c3cc3caee2 Merge "Merge \\"QS: Fix hotspot refreshing state\\" into nyc-dev am: b3ad74eb46 am: d69553b564" into nyc-mr1-dev-plus-aosp 2016-06-23 19:47:49 +00:00
Jason Monk
4445b56e31 Merge \\"QS: Fix hotspot refreshing state\\" into nyc-dev am: b3ad74eb46 
am: d69553b564

Change-Id: Ibd83625a30e23067f49bc11a136084b5d5522baf
 2016-06-23 19:47:22 +00:00
Jason Monk
005afe54c5 Merge \\"QS: Fix hotspot refreshing state\\" into nyc-dev am: b3ad74eb46 
am: 05943a3247

Change-Id: I1561c0ce1564454601c80f4f87512b8e0796549e
 2016-06-23 19:47:07 +00:00
Jason Monk
05943a3247 Merge \"QS: Fix hotspot refreshing state\" into nyc-dev 
am: b3ad74eb46

Change-Id: Icda7b70f140101ff07ecad9c5fd661e98ac68230
 2016-06-23 19:41:53 +00:00
Jason Monk
d69553b564 Merge \"QS: Fix hotspot refreshing state\" into nyc-dev 
am: b3ad74eb46

Change-Id: I341911d64699dcf157f61adce0226275336bace5
 2016-06-23 19:41:43 +00:00
TreeHugger Robot
b3ad74eb46 Merge "QS: Fix hotspot refreshing state" into nyc-dev 2016-06-23 19:33:17 +00:00
smain@google.com
10e29b895e fix bad contrast in table links by switching to normal table cells instead of headings. 
Change-Id: I91139ac2f01a9e099ffb5f65f4579a0b33ced5ab
 2016-06-23 12:09:30 -07:00
Jason Monk
6edbefdd54 QS: Hacks to fix bigger problems in TileService binding 
Bug: 29121793
Change-Id: I9cb8d8ee36ce5cc77ba3c11decb1b3a797fd7999
 2016-06-23 14:59:22 -04:00