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

293937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
be30f0d5ea Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-22 11:36:44 +00:00
TreeHugger Robot
0cb41b80af Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-22 11:35:36 +00:00
TreeHugger Robot
aa707f2547 Merge "Import translations. DO NOT MERGE" 2016-10-22 11:34:17 +00:00
TreeHugger Robot
a1be134b24 Merge "Import translations. DO NOT MERGE" 2016-10-22 11:33:40 +00:00
TreeHugger Robot
496d17f748 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-22 11:33:16 +00:00
TreeHugger Robot
d849122bbb Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-22 11:32:52 +00:00
Paulo Casanova
418063c63f Merge "Added JNI interface for aapt2." 2016-10-22 08:19:19 +00:00
Bill Yi
39eb3b4ac2 Import translations. DO NOT MERGE 
Change-Id: Ia238fb87c9c8be76cbadfbec1956b629414a3c48
Auto-generated-cl: translation import
 2016-10-22 01:11:45 -07:00
Bill Yi
300ad2e4b0 Import translations. DO NOT MERGE 
Change-Id: I3d5eae9008ead575fda0db5acbd233b4a9cf7273
Auto-generated-cl: translation import
 2016-10-22 00:52:51 -07:00
Bill Yi
e486a8f4b6 Import translations. DO NOT MERGE 
Change-Id: Iea19370bd97ac3bfaf398bd773b8f706461a6921
Auto-generated-cl: translation import
 2016-10-22 00:39:33 -07:00
Bill Yi
5b3efeebc1 Import translations. DO NOT MERGE 
Change-Id: Iea8977a449dd44d2bdbc0481a421606d5dfc3047
Auto-generated-cl: translation import
 2016-10-21 23:40:55 -07:00
TreeHugger Robot
ff356a5661 Merge "Add one more CategoryKey." 2016-10-22 06:28:46 +00:00
Julius D'souza
2155de983f Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev am: e2590cccfd 
am: 8c288cd77b  -s ours

Change-Id: Ic3d810fc1b13a0d896b7600329d2b925a5d76150
 2016-10-22 04:17:28 +00:00
Julius D'souza
39fdb8369c DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples am: a2b07dc8d9 
am: df09aa2135  -s ours

Change-Id: I03ed28868fc2965352e2fb68996a0e8fa81f47fd
 2016-10-22 04:14:22 +00:00
Julius D'souza
451e742f06 Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev am: e88cbbf40d 
am: af9361f565  -s ours

Change-Id: I06dca83d8bee11d0f8ad64770f7bff2e78ff40a9
 2016-10-22 04:13:23 +00:00
Julius D'souza
da6ace3a72 Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" am: 4fff94f1ed 
am: 5f55007bc2  -s ours

Change-Id: I14131de322a6ff87369c01372531c30812ec22ed
 2016-10-22 04:12:20 +00:00
Julius D'souza
8c288cd77b Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev 
am: e2590cccfd

Change-Id: I887432053d2503cf542ad3106ab915a0d4f3998f
 2016-10-22 04:05:59 +00:00
Julius D'souza
df09aa2135 DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples 
am: a2b07dc8d9

Change-Id: I1cc70bcb8dc946ab72f1ce5dd0b126d613d90d44
 2016-10-22 04:05:52 +00:00
Julius D'souza
af9361f565 Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev 
am: e88cbbf40d

Change-Id: I82350ac6ce99890d30542b7616dac8579eed0413
 2016-10-22 04:04:28 +00:00
Julius D'souza
5f55007bc2 Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" 
am: 4fff94f1ed

Change-Id: I3ce3d2b2af4be23fe9b57b907ef6db280543acbc
 2016-10-22 04:04:22 +00:00
Julius D'souza
e2590cccfd Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev 2016-10-22 03:58:28 +00:00
Julius D'souza
e88cbbf40d Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev 2016-10-22 03:58:02 +00:00
Robert Sesek
02bf0b6dbc Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546 am: f80fab010a 
am: aa544e975e

Change-Id: I561fff0f56bdbfdeb6c92c11c3fce12cf3fe28be
 2016-10-22 03:22:50 +00:00
Robert Sesek
aa544e975e Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546 
am: f80fab010a

Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
 2016-10-22 03:17:15 +00:00
Robert Sesek
f80fab010a Merge "Create the WebViewZygote and implement WebViewZygoteInit." 
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
 2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546 Merge "Create the WebViewZygote and implement WebViewZygoteInit." 2016-10-22 03:03:10 +00:00
Bill Yi
c27fdce39f Import translations. DO NOT MERGE 
Change-Id: I7564aa066446c6332e6cca5868905a8f05850fcc
Auto-generated-cl: translation import
 2016-10-21 19:45:18 -07:00
Jason Monk
a03413964a Merge "Fix vpn branded string usage" into nyc-mr1-dev am: 9db47b0f49 am: e28705ac90 
am: 7a12d75543

Change-Id: I293607cff0a3bab8653eeadf10a7c70da86656eb
 2016-10-22 02:42:15 +00:00
Jason Monk
c96dda5f16 Fix vpn branded string usage am: 59474a40af am: ec421cd433 
am: 7eef409c52

Change-Id: If1cefaf23db55037b421e5629a44ebf4c742cf4b
 2016-10-22 02:41:21 +00:00
Jason Monk
7a12d75543 Merge "Fix vpn branded string usage" into nyc-mr1-dev am: 9db47b0f49 
am: e28705ac90

Change-Id: I67337d3d11b2c21175ad64a2c841191b40127d78
 2016-10-22 02:37:21 +00:00
Bill Yi
8758da732f Import translations. DO NOT MERGE 
Change-Id: I4c1c1777ee5b308a1632fe4dc6973d94378e55fe
Auto-generated-cl: translation import
 2016-10-21 19:37:08 -07:00
Jason Monk
7eef409c52 Fix vpn branded string usage am: 59474a40af 
am: ec421cd433

Change-Id: I2dade8df4b700b244308e66d2d546b6d866a7260
 2016-10-22 02:36:16 +00:00
Jason Monk
e28705ac90 Merge "Fix vpn branded string usage" into nyc-mr1-dev 
am: 9db47b0f49

Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e
 2016-10-22 02:30:53 +00:00
Jason Monk
ec421cd433 Fix vpn branded string usage 
am: 59474a40af

Change-Id: Ie6945d5978394024ae2f06edb29c38a18459e504
 2016-10-22 02:30:51 +00:00
TreeHugger Robot
9db47b0f49 Merge "Fix vpn branded string usage" into nyc-mr1-dev 2016-10-22 02:23:07 +00:00
Julius D'souza
a2b07dc8d9 DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples 
Bug: 32169300

Change-Id: If7eb443bc7c4bcc21eb4bc317f4fcd1219e9e25b
 2016-10-21 19:22:23 -07:00
Julius D'souza
4fff94f1ed Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" 
This reverts commit 637ae798ccd8762b6e53fcdfdf1aec6c3c8cf23a.

Change-Id: I1c7b449a2b13d5d3d956ac0570cb14b49c2e8b2c
 2016-10-22 02:21:01 +00:00
TreeHugger Robot
cc7be7e753 Merge "Use VR hal in VrManagerService." 2016-10-22 01:22:38 +00:00
TreeHugger Robot
b366402a68 Merge "AAPT2: Ensure string pool ordering is compact" 2016-10-22 00:37:20 +00:00
Jeremy Joslin
f524e1c67f VPN network stat accounting changes. am: 3f0d75afe8 am: 0d309b7a47 
am: 807102d7ff

Change-Id: I1edec6bf2a590f5b0ff010adfd6f2785a1aaa994
 2016-10-21 23:47:35 +00:00
Jeremy Joslin
807102d7ff VPN network stat accounting changes. am: 3f0d75afe8 
am: 0d309b7a47

Change-Id: I797ac586581f83ada0e94639dd435122c987f1c1
 2016-10-21 23:43:06 +00:00
Jeremy Joslin
0d309b7a47 VPN network stat accounting changes. 
am: 3f0d75afe8

Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
 2016-10-21 23:37:57 +00:00
Fan Zhang
e6bcfb0158 Add one more CategoryKey. 
This is used in secondary setting page: App & Notification > AppDefaults

Bug: 31799948
Test: manual
Change-Id: Icc8fa15352006034743c17d2ee943c05a21f612f
 2016-10-21 16:35:39 -07:00
Jason Monk
59474a40af Fix vpn branded string usage 
Change-Id: I42fdca60536425c757759414ac812b20e0b42823
Fixes: 32071681
 2016-10-21 19:27:34 -04:00
Julius D'souza
2c2b2eca9c Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev am: a39e64eac2 
am: 38405b69d2  -s ours

Change-Id: I85c746508e10e7b7b739587b7d9fce081d53ecca
 2016-10-21 22:43:16 +00:00
Julius D'souza
6f30787f5c DO NOT MERGE: Disable dim brightness reset when using ALS-based doze am: 637ae798cc 
am: 0085ce0513  -s ours

Change-Id: Ibded7dd4f59a18ef3268d7c5f19074679392d234
 2016-10-21 22:42:09 +00:00
Julius D'souza
38405b69d2 Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev 
am: a39e64eac2

Change-Id: I76a3334bd1464d9d8591f4bf1bbe369d90753d5e
 2016-10-21 22:37:04 +00:00
Julius D'souza
0085ce0513 DO NOT MERGE: Disable dim brightness reset when using ALS-based doze 
am: 637ae798cc

Change-Id: I3c2045d253a75d9afcf8771a503188c47d8de49d
 2016-10-21 22:36:58 +00:00
Joe Onorato
8e16c1d458 Merge "Another mac fix" 2016-10-21 22:32:34 +00:00
Joe Onorato
31617e3b8f Another mac fix 
Test: make (on linux)
Change-Id: I3f0561f3a1fc08dad5d3dd8ba860da56b51d273c
 2016-10-21 15:29:51 -07:00