drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,461 Commits 1 Branch 0 Tags
Commit Graph

256461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kwan
243e966892 Merge "Fix improperly laid out alert dialog title to match UX specs." into cw-f-dev 2016-10-21 20:38:04 +00:00
Vinod Krishnan
cf11ceab65 Fwk: Only chime when docked and accessbility is on 
Bug: 32036947

Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
 2016-10-21 10:28:37 -07:00
TreeHugger Robot
653b982d18 Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev 2016-10-21 17:23:45 +00:00
Erik Wolsheimer
b608d28f84 DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time 
BUG: 32172459
BUG: 32069897
Change-Id: I6f030b6288433b9cefce0f2fb1a69de61bfa7617
 2016-10-21 09:27:15 -07:00
Lorenzo Colitti
625166377b CaptivePortalLogin: set mixed content policy to compatibility. 
This makes the policy for mixed HTTP/HTTPS content match Chrome.
This allows us to display login pages where unimportant
subresources are HTTP.

Bug: 32171569
Change-Id: Ic8bc1440f1f26898ddbc0984fd1ddd2155c9588b
 2016-10-21 18:47:57 +09:00
Jeremy Joslin
3f0d75afe8 VPN network stat accounting changes. 
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
 2016-10-21 18:47:57 +09:00
Jakub Adamek
4f8b640bb7 Add new color: accent with 60% opacity. 
Bug: 32201256
Change-Id: Id09420b78941b59df2f248dd75994fb7275ec2ea
 2016-10-21 09:12:23 +01:00
Jakub Adámek
42f40b159f Merge "Fix idmap calls when a subdir is present." into cw-f-dev 2016-10-21 07:51:19 +00:00
Jakub Adamek
56b9987ed7 Fix idmap calls when a subdir is present. 
We need to increase the size of argv so that the last one remains
a NULL.

Bug: 32202741
Change-Id: I6636b5401fa7a61686a48c9a99b3e54e596033f9
 2016-10-21 08:50:00 +01:00
Flavio Lerda
327dbfb94f Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev 2016-10-21 06:32:21 +00:00
Michael Kwan
9c86e68bfa Fix improperly laid out alert dialog title to match UX specs. 
Test: visual inspect using ApiDemos

Bug: 32315229
Change-Id: I486edc94c077af49e1235519e158e55833796231
 2016-10-20 18:39:31 -07:00
Agnieszka Madurska
faf09eaa40 Merge "Add custom scrollbars to the default device theme" into cw-f-dev 2016-10-20 21:39:51 +00:00
Matthew Fritze
46af871c00 Merge "Default for sending package name to support should be false" into nyc-mr1-dev 
am: 71ae440ac2

Change-Id: Idc18efe910dda8339e5fa7030e61b6172092f64a
 2016-10-20 21:16:24 +00:00
Matthew Fritze
4d9085f1d2 Default for sending package name to support should be false 
am: b68a83a8eb

Change-Id: Ic30a1508a9f7a8b1592778fc7eaa44692e99e579
 2016-10-20 21:16:20 +00:00
Matthew Fritze
71ae440ac2 Merge "Default for sending package name to support should be false" into nyc-mr1-dev 2016-10-20 21:05:09 +00:00
Jacky Cheung
8167362bab Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev 2016-10-20 20:42:09 +00:00
Calvin On
4bc78eba6f Add option to skip and avoid captive portals. 
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit be96da11ccb5dd500f920c3ba90d350857293b3d)
 2016-10-20 18:50:46 +00:00
Matthew Fritze
b68a83a8eb Default for sending package name to support should be false 
Change-Id: I2cc90cac2c2c72f9febb015487f8854ebf006aac
Fixes: 32303343
Test: manual
 2016-10-20 11:24:54 -07:00
Jacky Cheung
84c6d339ee Gradually increase the level of authentication on failed GATT operations. 
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.

Change-Id: I68335cf7451aeaf49c227d604f69cb329d117d08
 2016-10-20 18:17:12 +00:00
Bill Yi
f9ca194dbe Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 3623134476  -s ours

Change-Id: Ia0155fdcebd8c81c24dd68ea345ad4fb40a110d3
 2016-10-20 16:03:58 +00:00
Bill Yi
8236940965 Import translations. DO NOT MERGE 
am: 66dc59064a  -s ours

Change-Id: Ic64d34c0cc499094b3e43789ed9f28f45801b8cd
 2016-10-20 16:03:56 +00:00
Bill Yi
4df6ac860e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: f7a7712d50  -s ours

Change-Id: I2c73b3824bd0fdcb3628e71c641b811202d26d2a
 2016-10-20 16:02:34 +00:00
Bill Yi
a3e34d4384 Import translations. DO NOT MERGE 
am: 5ad7d6e328  -s ours

Change-Id: I6b1a80f5cbc2282afe50101e2a6fdc3b7c17db52
 2016-10-20 16:02:32 +00:00
Bill Yi
3aa778d239 Import translations. DO NOT MERGE 
am: 7f5b5eee99  -s ours

Change-Id: I550b053800133c76cc6abf3daeefd2790ffe2363
 2016-10-20 15:56:51 +00:00
TreeHugger Robot
0f62ca3a57 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-20 15:54:28 +00:00
TreeHugger Robot
3623134476 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-20 15:53:29 +00:00
TreeHugger Robot
f7a7712d50 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-20 15:52:53 +00:00
Bill Yi
7f5b5eee99 Import translations. DO NOT MERGE 
Change-Id: I6fffe370549a3c2904043151dee4bc06f6799f81
Auto-generated-cl: translation import
 2016-10-20 07:17:55 -07:00
Bill Yi
5ad7d6e328 Import translations. DO NOT MERGE 
Change-Id: Ie1d22964ed960d5388377f461a26836d2d24749c
Auto-generated-cl: translation import
 2016-10-20 03:57:17 -07:00
Bill Yi
66dc59064a Import translations. DO NOT MERGE 
Change-Id: Idd3482da6612d83091fbc13a3733a19a2008f0c1
Auto-generated-cl: translation import
 2016-10-20 03:49:00 -07:00
Bill Yi
59d5ed7768 Import translations. DO NOT MERGE 
Change-Id: Iaad30d2e0f0119cbb3213bea5948dab67785ec06
Auto-generated-cl: translation import
 2016-10-19 22:35:19 -07:00
Bill Yi
0de1d97546 Import translations. DO NOT MERGE 
Change-Id: I045e600a36fa58956970ca71099db67d6a6edf7f
Auto-generated-cl: translation import
 2016-10-19 22:26:54 -07:00
Selim Cinek
f58948fc04 Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev 
am: d9a569ae58

Change-Id: I47ba110bd4a53f59647f37a5466cb8c4b0fd8966
 2016-10-20 02:34:55 +00:00
Selim Cinek
73595daf43 Fixed a grey flash when swiping away the last notification 
am: 54680901ed

Change-Id: I050754c1f749b7c5fce81359a52b7eba2f7b7d67
 2016-10-20 02:34:48 +00:00
TreeHugger Robot
d9a569ae58 Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev 2016-10-20 02:21:37 +00:00
Tyler Gunn
f1de362abe Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." into nyc-mr1-dev 
am: 049980c284

Change-Id: I003ba96a8358b3104acae03f8e2a3e53d8b976df
 2016-10-20 01:06:56 +00:00
Tyler Gunn
7f4abb2a05 Framework fixes to support VoLTE conf calls via RemoteConnectionServices. 
am: 2282bb97e7

Change-Id: Ibc446de0822d379bc367d6bc410e9830b65d5d20
 2016-10-20 01:06:48 +00:00
Tyler Gunn
049980c284 Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." into nyc-mr1-dev 2016-10-20 00:56:20 +00:00
Selim Cinek
54680901ed Fixed a grey flash when swiping away the last notification 
Change-Id: I12edf673f29abad66fa6704004886124eee9978b
Fixes: 32289359
Test: have 1 notification, swipe it a way, observe no flashing in statusbar
 2016-10-20 00:07:26 +00:00
Kevin Hufnagle
873d2f4404 Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev 
am: fee89015c5

Change-Id: Ieeb9f7424d8f8e7845417f069b044e50b95c693f
 2016-10-19 23:53:40 +00:00
Kevin Hufnagle
38138600d2 docs: Updated ShortcutManager and ShortcutInfo class references. 
am: 68d699d100

Change-Id: I3d6ba36f36eddc3e9075383011732143c910a13f
 2016-10-19 23:53:36 +00:00
Kevin Hufnagle
fee89015c5 Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev 2016-10-19 23:43:52 +00:00
Winson
be0eded075 Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev 
am: 5f4169b5ea

Change-Id: I98a6d30d26fd00d09e670d22663617ccd0c5ca62
 2016-10-19 19:18:31 +00:00
Winson
cfdbd7b2e2 Skip getting transforms for ignored tasks. 
am: 448c0adb78

Change-Id: Ie929c699ee466b1298acab07eefa68006a92cdb1
 2016-10-19 19:18:26 +00:00
Andrii Kulian
618b3cb6fa Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev 
am: 6e4f6ecbab

Change-Id: I56995f1b7239f4b3bb1a81c46891af04016561f0
 2016-10-19 19:16:52 +00:00
Andrii Kulian
39be2e91ca DO NOT MERGE -- Use focused activity value when moving task back 
am: da3b648b64

Change-Id: Ib706755c056ed27050375a675169f7df3f5f141a
 2016-10-19 19:16:50 +00:00
TreeHugger Robot
5f4169b5ea Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev 2016-10-19 18:45:26 +00:00
Andrii Kulian
6e4f6ecbab Merge "DO NOT MERGE -- Use focused activity value when moving task back" into nyc-mr1-dev 2016-10-19 18:31:37 +00:00
Dan Yu
a2ffd6e04c Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 am: 8233c03d1e 
am: 0346fee93c

Change-Id: I1997e8e14e5d0ddfbf60ea08797b57d107393411
 2016-10-19 18:12:16 +00:00
Dan Yu
0346fee93c Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am: dc69de5ac6 am: 3aa0ff2de7 
am: 8233c03d1e

Change-Id: If0291ee0b6df1c0fb81785b490cdf716ba9cc8b7
 2016-10-19 18:05:37 +00:00