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

220682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
14bb0511c6 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-26 16:28:12 +00:00
Geoff Mendal
a03cd002b3 Merge "Import translations. DO NOT MERGE" 2015-10-26 16:27:21 +00:00
Geoff Mendal
7afd89dfbb Import translations. DO NOT MERGE 
Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a
Auto-generated-cl: translation import
 2015-10-26 11:27:14 -05:00
Geoff Mendal
8c682c6c49 Import translations. DO NOT MERGE 
Change-Id: If16d9ce42e80f3b4961d7d7e878870718ad0806b
Auto-generated-cl: translation import
 2015-10-26 11:14:49 -05:00
Paul Jensen
b6d8f81b10 Merge "Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN" 2015-10-26 15:15:33 +00:00
Julia Reynolds
537af1070b Merge "SystemUI: Reload the EndNowButton label" am: 40b52bbe48 
am: c7839bde7c

* commit 'c7839bde7cd8ed21326208b17030c87e8bf206c9':
  SystemUI: Reload the EndNowButton label
 2015-10-26 15:15:24 +00:00
Julia Reynolds
c7839bde7c Merge "SystemUI: Reload the EndNowButton label" 
am: 40b52bbe48

* commit '40b52bbe480436fbdc3bfb8a1a70c6144e71ff8f':
  SystemUI: Reload the EndNowButton label
 2015-10-26 15:05:34 +00:00
Julia Reynolds
40b52bbe48 Merge "SystemUI: Reload the EndNowButton label" 2015-10-26 14:57:34 +00:00
Johan Redestig
f2d824fd56 SystemUI: Reload the EndNowButton label 
Reload the EndNowButton label when configuration
changes.

Change-Id: I042d31f0bb011996aa8219c3c412e7b71987244c
 2015-10-26 15:51:23 +01:00
Geoff Mendal
5a33a869e3 Import translations. DO NOT MERGE am: f6fc9e2152 -s ours am: 432eb8e686 -s ours 
am: 8b41305696  -s ours

* commit '8b41305696055296016e57c82520eeac9c2a57d4':
  Import translations. DO NOT MERGE
 2015-10-26 14:50:48 +00:00
Geoff Mendal
8b41305696 Import translations. DO NOT MERGE am: f6fc9e2152 -s ours 
am: 432eb8e686  -s ours

* commit '432eb8e686ce1f4f993b74be73ec035341fa4599':
  Import translations. DO NOT MERGE
 2015-10-26 14:42:15 +00:00
Geoff Mendal
432eb8e686 Import translations. DO NOT MERGE 
am: f6fc9e2152  -s ours

* commit 'f6fc9e215292945ef3add558e513e5eef01acbfe':
  Import translations. DO NOT MERGE
 2015-10-26 14:31:12 +00:00
Derek Sollenberger
eba81d0f88 Add missing include for SkPath 
Change-Id: Ib1577714d0e5c7e7c7d0e6593debe30e78f0df59
 2015-10-26 14:23:58 +00:00
Geoff Mendal
f6fc9e2152 Import translations. DO NOT MERGE 
Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63
Auto-generated-cl: translation import
 2015-10-26 07:17:06 -07:00
Geoff Mendal
b1423ddee9 Merge "Import translations. DO NOT MERGE" 2015-10-26 13:09:24 +00:00
Geoff Mendal
4200c9c0bc Import translations. DO NOT MERGE 
Change-Id: Ibfc65ba41159a6f46117aa5015533bdced91cd56
Auto-generated-cl: translation import
 2015-10-26 06:08:45 -07:00
Geoff Mendal
968793f18f Merge "Import translations. DO NOT MERGE" 2015-10-26 12:57:14 +00:00
Geoff Mendal
cc98d3fa51 Import translations. DO NOT MERGE 
Change-Id: Idcb5330948acdc172f2af763f32e6d8235d64a30
Auto-generated-cl: translation import
 2015-10-26 05:56:23 -07:00
Geoff Mendal
b6212f2604 Merge "Import translations. DO NOT MERGE" 2015-10-26 12:51:25 +00:00
Geoff Mendal
10701893a8 Import translations. DO NOT MERGE 
Change-Id: I8635097aee86e5c12b142769ec91d8788d800c22
Auto-generated-cl: translation import
 2015-10-26 05:50:22 -07:00
Geoff Mendal
89f0ec3cc2 Merge "Import translations. DO NOT MERGE" 2015-10-26 12:50:05 +00:00
Geoff Mendal
a1cf03194b Import translations. DO NOT MERGE 
Change-Id: I9fe6c2348c55959ac4adb4e93eda481b6886a697
Auto-generated-cl: translation import
 2015-10-26 05:42:22 -07:00
Geoff Mendal
3e8f4619ef Import translations. DO NOT MERGE am: a1ecb9ee2b -s ours am: a0b24e64d0 -s ours 
am: 36dc6cc522  -s ours

* commit '36dc6cc52202fb7cb85acdd3572cf1a5fb085f51':
  Import translations. DO NOT MERGE
 2015-10-26 12:41:06 +00:00
Geoff Mendal
36dc6cc522 Import translations. DO NOT MERGE am: a1ecb9ee2b -s ours 
am: a0b24e64d0  -s ours

* commit 'a0b24e64d0dfadbac5abf8db94ff57b130771ed2':
  Import translations. DO NOT MERGE
 2015-10-26 12:32:08 +00:00
Geoff Mendal
a0b24e64d0 Import translations. DO NOT MERGE 
am: a1ecb9ee2b  -s ours

* commit 'a1ecb9ee2b51a858d8bba73d31de6611a178f2e6':
  Import translations. DO NOT MERGE
 2015-10-26 12:24:45 +00:00
Geoff Mendal
7b88319c0a Import translations. DO NOT MERGE 
Change-Id: I7dbb15bd324164e0349b7204b239a1547351405b
Auto-generated-cl: translation import
 2015-10-26 05:21:10 -07:00
Geoff Mendal
a1ecb9ee2b Import translations. DO NOT MERGE 
Change-Id: Iafffd8db9db17c15f46c82ba641c6f6ad83d4059
Auto-generated-cl: translation import
 2015-10-26 05:11:27 -07:00
Neil Fuller
108d04cccf Merge "Adjust for changes to libcore/Docs.mk" am: f5e3398596 am: c08debc23a 
am: 144af426cd

* commit '144af426cde3ce336ed9f670ae596807a14ab809':
  Adjust for changes to libcore/Docs.mk
 2015-10-26 10:24:00 +00:00
Neil Fuller
144af426cd Merge "Adjust for changes to libcore/Docs.mk" am: f5e3398596 
am: c08debc23a

* commit 'c08debc23ab0dfa38cab168f4c631b15b2b17d64':
  Adjust for changes to libcore/Docs.mk
 2015-10-26 10:17:55 +00:00
Neil Fuller
c08debc23a Merge "Adjust for changes to libcore/Docs.mk" 
am: f5e3398596

* commit 'f5e33985964c3e7acf6b9cd16d94a110e4f9a42d':
  Adjust for changes to libcore/Docs.mk
 2015-10-26 10:11:23 +00:00
Neil Fuller
f5e3398596 Merge "Adjust for changes to libcore/Docs.mk" 2015-10-26 10:04:30 +00:00
Bryce Lee
c2f421a869 Add Telecom config bool to require a phone account to be present for handle 
Bug: 25202039
Change-Id: I83f6a72ed78fd22bddc7be46d24af33781a65f6e
 2015-10-25 22:27:10 -07:00
Daichi Hirono
e248073902 Merge "Add MtpDatabase class." 2015-10-26 01:42:24 +00:00
Daichi Hirono
9678f60633 Add MtpDatabase class. 
The class stores document information and will be used to remap object
handle with document ID when the process resumes.

BUG=25162822
Change-Id: Ic1a2f60ae0ee90b6c2b77a89a578cef1e0e917f2
 2015-10-26 10:41:03 +09:00
Filip Gruszczynski
5596c05d04 Merge "Remove incorrect log statement about showing window surface." 2015-10-25 20:27:18 +00:00
Filip Gruszczynski
dd2ff841d3 Fix recents <-> full screen animations in landscape. 
Somewhere along the way we lost the accounting for system decorations
when calculating the crop of the application window during the
recents to/from full screen app transition. This is necessary,
otherwise the animation starts/ends with a black navigation bar and
there is no sense of continuity with the recents thumbnail.

Change-Id: I75bc77cc4badca40b7c59ded39e0d4f72e36c739
 2015-10-25 13:11:04 -07:00
Filip Gruszczynski
2981ca469e Remove incorrect log statement about showing window surface. 
This log statement is purely confusing. It is logged as if it was
performing a surface operation of showing a window, but in reality
it does no such thing. Because of this the log doesn't match the
reality. Even though the window should be visible at the end of the
transaction, it isn't - the real show will be called when the
first step of the animation is performed.

Change-Id: I2b207c5df5274a67b8d650a5e84beadd7448162c
 2015-10-24 15:41:03 -07:00
Puneet Kumar
904271d904 Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev am: ca9c43b27b am: fc12c7c1b7 am: b0482fe29e 
am: f58fc291a8

* commit 'f58fc291a855c2f8ec4f493b0a54af668271714b':
  Prevent recents from coming up when in SUW
 2015-10-24 16:03:42 +00:00
Puneet Kumar
f58fc291a8 Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev am: ca9c43b27b am: fc12c7c1b7 
am: b0482fe29e

* commit 'b0482fe29e96d370c350ce3815a84a69617f1bb5':
  Prevent recents from coming up when in SUW
 2015-10-24 15:57:12 +00:00
Puneet Kumar
b0482fe29e Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev am: ca9c43b27b 
am: fc12c7c1b7

* commit 'fc12c7c1b7ecd71517feb70ec4fe027545fda4c2':
  Prevent recents from coming up when in SUW
 2015-10-24 15:50:08 +00:00
Puneet Kumar
fc12c7c1b7 Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev 
am: ca9c43b27b

* commit 'ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3':
  Prevent recents from coming up when in SUW
 2015-10-24 15:42:33 +00:00
Puneet Kumar
ca9c43b27b Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev 2015-10-24 15:20:28 +00:00
Michael Wright
d847ad5555 Prevent recents from coming up when in SUW 
Bug: 25229538
Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90
 2015-10-24 13:24:15 +01:00
Dan Sandler
4e51636bd0 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509 am: 493272c8a7 am: 06eb98c04d am: a540cbd00f 
am: 3b98be1350  -s ours

* commit '3b98be13503179b8e4becb4c2a4664e3eaac098e':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 01:57:51 +00:00
Dan Sandler
3b98be1350 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509 am: 493272c8a7 am: 06eb98c04d 
am: a540cbd00f

* commit 'a540cbd00fb465faeb88eed2ba233f601abdbc7f':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 01:44:34 +00:00
Dan Sandler
93cbde37bc Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: 6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b am: d9a96ff747 am: e41b3b35b5 am: 681a397716 
am: 4c8049f20c  -s ours

* commit '4c8049f20c3fd739f22c128367f1eef3389f3953':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 01:23:14 +00:00
Dan Sandler
49e33c0615 Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 446dcc9ed7 am: 4db8c18755 am: 5da8453866 am: 625c731ccd 
am: 170e9d17ec  -s ours

* commit '170e9d17ec9fe2d1eb29c322450ca5170cbf3e7e':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 01:21:06 +00:00
Dan Sandler
a540cbd00f Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509 am: 493272c8a7 
am: 06eb98c04d

* commit '06eb98c04d82cd7f6094aca738fc449d4f8af3fd':
  Delay hiding the cast icon for 3 seconds. DO NOT MERGE
 2015-10-24 01:21:05 +00:00
Vladislav Kaznacheev
e71a321305 Fix drag and drop URI permission grants 
Currently cross app drag and drop with content URIs
only works for Owner. This is because the source Uid
is initialized after a Binder.clearCallingIdentity call.
The real source app identity is lost and things work
by accident for Owner only.

Bug: 25232077
Change-Id: Iaaaa735a04909a3b05fae7a7a421dbf02206cd68
 2015-10-23 18:11:55 -07:00
Winson Chung
439aeba34d Merge "Fixing regression in stack task clipping." 2015-10-24 01:05:05 +00:00