Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
3cfbe6e7ea Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:57:46 +00:00
TreeHugger Robot
7d84e110cb Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:57:29 +00:00
TreeHugger Robot
d8a450557e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:57:22 +00:00
TreeHugger Robot
cb4bea3ae8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:56:57 +00:00
TreeHugger Robot
9d41bf11df Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:56:41 +00:00
TreeHugger Robot
a68d1f10e2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:56:16 +00:00
TreeHugger Robot
2130b28754 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:58 +00:00
TreeHugger Robot
e30eb8b3ba Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:55:39 +00:00
TreeHugger Robot
c31029409a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:55:21 +00:00
TreeHugger Robot
ef2989920d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:55:03 +00:00
TreeHugger Robot
3d9d9fa0d9 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:54:40 +00:00
TreeHugger Robot
b51541753a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:53:48 +00:00
TreeHugger Robot
4233404ee4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 16:53:29 +00:00
TreeHugger Robot
cace07e727 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 16:53:13 +00:00
Robert Greenwalt
57ea9d02e5 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 6a5c9560a3 
am: c4e25b26de

* commit 'c4e25b26defa019041d2e596381be69b7a68210c':
  Add support for UNSOL PCO Data.

Change-Id: I77697380a179bd9894cfb21c71c734b9b8781016
 2016-06-03 16:50:13 +00:00
Robert Greenwalt
c4e25b26de Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev 
am: 6a5c9560a3

* commit '6a5c9560a33337fc82362d77bc4bae633953428d':
  Add support for UNSOL PCO Data.

Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
 2016-06-03 16:44:29 +00:00
Bill Yi
4535c0f80c Import translations. DO NOT MERGE 
Change-Id: Id381d85225a2de4b0e0c1f2d3fba40143ed738a2
Auto-generated-cl: translation import
 2016-06-03 09:43:50 -07:00
Robert Greenwalt
6a5c9560a3 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev 2016-06-03 16:38:58 +00:00
Bill Yi
686d0d7cf6 Import translations. DO NOT MERGE 
Change-Id: Ie630e761cacbec55840a3de9439aa36835a34b38
Auto-generated-cl: translation import
 2016-06-03 09:33:00 -07:00
Clara Bayarri
1851790fa7 Merge "Add setOnDateChangedListener to DatePicker" 2016-06-03 16:30:51 +00:00
Bill Yi
df4b7bcafa Import translations. DO NOT MERGE 
Change-Id: I046db29b7718914aaab4d40f7dc1aa284255198a
Auto-generated-cl: translation import
 2016-06-03 09:27:25 -07:00
Adrian Roos
3441c6a6ec Merge "Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc am: d49a86ceda" into nyc-mr1-dev-plus-aosp 
am: c53e13654e

* commit 'c53e13654ecb4a8c026776c748972b64790520ae':

Change-Id: I7f51f2e9c7e5a73060c632c80f5beb8c8a85c112
 2016-06-03 16:18:41 +00:00
Adrian Roos
bec2007236 Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc am: 50844bc504 
am: 3c8c89db25

* commit '3c8c89db25a8296b9bae450c4bfc1a31c25ebf08':
  Fix BigText transitions

Change-Id: I64d22508c458db3b8b10359d4ac280986693f4b5
 2016-06-03 16:18:39 +00:00
Bill Yi
29e1099f93 Import translations. DO NOT MERGE 
Change-Id: I84e7cf1ca696555a2af6838dcae6a32df4503822
Auto-generated-cl: translation import
 2016-06-03 09:16:16 -07:00
Victor Chang
b04a5eab84 Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on 
Cause: It revoked the user consent of the vpn app without reseting always-on vpn.
In addition, prepareVpn sets legacy vpn as the current package, the state in
Vpn.class is broken, as it thought the current always-on package is legacy vpn,
(mAlwaysOn is only for app vpn, not for legacy vpn). As a result, prepareVpn rejects
all VpnService.prepare.

Bug: 29031820
Change-Id: Id6bf1d6f38cf134a872811806301b8a602fb5725
 2016-06-03 17:14:32 +01:00
Android Build Merger (Role)
c53e13654e Merge "Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc am: d49a86ceda" into nyc-mr1-dev-plus-aosp 2016-06-03 16:14:16 +00:00
Adrian Roos
3c8c89db25 Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc 
am: 50844bc504

* commit '50844bc50429e6e6f4f0d33b177491c25f47e6ce':
  Fix BigText transitions

Change-Id: I822241014f796954ee80e5d3ad2ba747f2ef1f03
 2016-06-03 16:13:46 +00:00
Adrian Roos
f5ea88432a Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc 
am: d49a86ceda

* commit 'd49a86ceda243515019d267d4fbecc3cc99cb456':
  Fix BigText transitions

Change-Id: Ife5601ffb5323f73e817881d47a7ead1c89f2504
 2016-06-03 16:13:44 +00:00
Matt Sarett
7678d6b19a Merge "Fix uses of SkImageInfo in BitmapFactory to preserve color space info" 2016-06-03 16:04:14 +00:00
Adrian Roos
50844bc504 Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
 2016-06-03 15:53:09 +00:00
Adrian Roos
d49a86ceda Merge "Fix BigText transitions" into nyc-dev 
am: 2ab4f451dc

* commit '2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
  Fix BigText transitions

Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
 2016-06-03 15:53:07 +00:00
Makoto Onuki
cffb6041d2 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710 
am: 51c7ce7531

* commit '51c7ce7531f5c1fc1ae442b1c6f206735599cea2':
  ShortcutManager: Implement usage report API

Change-Id: Ia713dbbb510d2f848b8866a4d0dc692f67803522
 2016-06-03 15:44:53 +00:00
Makoto Onuki
51c7ce7531 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 
am: 37087ad710

* commit '37087ad710087755786c115508b14e053c47f882':
  ShortcutManager: Implement usage report API

Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
 2016-06-03 15:37:10 +00:00
TreeHugger Robot
2ab4f451dc Merge "Fix BigText transitions" into nyc-dev 2016-06-03 15:36:11 +00:00
Sudheer Shanka
54cb63c182 Avoid triggering support dialog in non-current user. 
Bug: 28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617
 2016-06-03 08:26:04 -07:00
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Clara Bayarri
68640b6809 Add setOnDateChangedListener to DatePicker 
Also refactor slightly the hierarchy in TimePicker to use the
common parent AbstractTimePickerDelegate in the same way as
DatePicker.

Bug: 28310875
Change-Id: Iecaf206ba1691e26d4496014dc1d13f070c4722a
 2016-06-03 15:42:06 +01:00
Matt Sarett
ee80c47163 Fix uses of SkImageInfo in BitmapFactory to preserve color space info 
Change-Id: I1b67d10cd8a2c9ece35154a55060577a7747aebb
 2016-06-03 14:39:10 +00:00
Julia Reynolds
cf4a36ba99 Merge "Don\'t leak guts. am: cdf98e1964 am: 08cc30378c" into nyc-mr1-dev-plus-aosp 
am: 68863004b7

* commit '68863004b77f02af7098d97b42ed6f7a60ee279f':

Change-Id: I7bacd60943a1880d6fdb917f91e4636d851ed04e
 2016-06-03 13:58:57 +00:00
Julia Reynolds
da766175e2 Don\'t leak guts. am: cdf98e1964 am: 0853233433 
am: 1f8275e314

* commit '1f8275e3141f1b7c5150c6ffa26515c0701d8eba':
  Don't leak guts.

Change-Id: I0fdb85d071409d28dca9325d36ee5ac88455fbd5
 2016-06-03 13:58:53 +00:00
Android Build Merger (Role)
68863004b7 Merge "Don\'t leak guts. am: cdf98e1964 am: 08cc30378c" into nyc-mr1-dev-plus-aosp 2016-06-03 13:47:13 +00:00
Julia Reynolds
1f8275e314 Don\'t leak guts. am: cdf98e1964 
am: 0853233433

* commit '0853233433958eb9c97d8237341be58895e8a541':
  Don't leak guts.

Change-Id: Ifa768e26b323a46cd595feebaec2e947415b938e
 2016-06-03 13:46:47 +00:00
Julia Reynolds
9561af35f2 Don\'t leak guts. am: cdf98e1964 
am: 08cc30378c

* commit '08cc30378c12c47250ab05491346d940194a29f8':
  Don't leak guts.

Change-Id: Ieea32af97aef5a75633112bb15bf6d6453080dab
 2016-06-03 13:46:43 +00:00
Julia Reynolds
08cc30378c Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
 2016-06-03 13:33:11 +00:00
Julia Reynolds
0853233433 Don\'t leak guts. 
am: cdf98e1964

* commit 'cdf98e1964489916c68e240bd92c2e0bedab3c2d':
  Don't leak guts.

Change-Id: Id7e53a4e108280c8b843413fa377ae40ea0acb2e
 2016-06-03 13:33:08 +00:00
Julia Reynolds
cdf98e1964 Don't leak guts. 
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes: 29064258
 2016-06-03 13:17:47 +00:00
Bill Yi
147c6d75d8 Import translations. DO NOT MERGE 
Change-Id: I2e818cdd84923a3b9cda7d4954ba5f492a9817f4
Auto-generated-cl: translation import
 2016-06-03 06:09:07 -07:00
Bill Yi
aff777e609 Import translations. DO NOT MERGE 
Change-Id: I2fd4e7683d9c10652bacfc820593e07bd58cefc0
Auto-generated-cl: translation import
 2016-06-03 06:04:14 -07:00
Bill Yi
e3a9c58c32 Import translations. DO NOT MERGE 
Change-Id: I46dc39205d2e1652f96638ed246431742c63f93e
Auto-generated-cl: translation import
 2016-06-03 06:01:48 -07:00
Bill Yi
b67c06c31a Import translations. DO NOT MERGE 
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
 2016-06-03 05:23:35 -07:00