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

194710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
43fbaf34c5 Import translations. DO NOT MERGE 
Change-Id: I6645c53b1ec2f48524d162e7c9a771e0684e3628
Auto-generated-cl: translation import
 2015-06-10 09:37:36 -07:00
James Cook
f22030d1c5 Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 2015-06-10 15:47:23 +00:00
Paul Lawrence
0c3aa4834e Merge "Remove hex encoding and password adjusting now that patterns are '1' based" into mnc-dev 2015-06-10 15:42:42 +00:00
Paul Jensen
67b0b0756b Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs 
Overlapping the NetIDs can cause the ConnectivityService instance under test
to inadvertently use real networks, for example when NetworkMonitor attempts
to validate a network.  This fixes test hangs when run on devices with
active internet connections.

Change-Id: I5e1898953f0117b9f75beccac4a52ae2db173567
 2015-06-10 11:30:26 -04:00
Lorenzo Colitti
bc7b1a4ca2 Merge "When no Internet access is detected, display a notification first." into mnc-dev 2015-06-10 15:25:31 +00:00
Keisuke Kuroyanagi
136a462c8b Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 2015-06-10 15:13:16 +00:00
Keisuke Kuroyanagi
eac4556e55 Revert "Fix: Crash when modifying text while using drag accelerator." 
This reverts commit 259292ff3de5b9a64e8e3bb4a62a533aef4125b7.

This introduced another bug (Bug: 21687602) and this is no longer useful
for the original one (Bug: 21178876).


Change-Id: I59acc161e7d8cba633718a3d17292e68740ef79e
 2015-06-10 15:02:22 +00:00
Jason Monk
b73390acdd Merge "Fix work apps showing as not installed for owner" into mnc-dev 2015-06-10 14:58:56 +00:00
Lorenzo Colitti
f6673d07c3 When no Internet access is detected, display a notification first. 
Previously, we displayed a dialog on top of whatever the user was
doing. Instead, display a notification that can take the user to
the dialog.

Because the notification is less intrusive, also enable it even
if the network without Internet access is already the system
default network. Previously we did not do this because in that
case the user might not have other useful options, and thus a
dialog would have been too intrusive.

Bug: 20081183
Bug: 20538448
Change-Id: I677be238d675c13a13dc0bae2dbb37cbe4f52cb6
 2015-06-10 23:37:00 +09:00
Chet Haase
81728b862e Merge "Clarify docs for Animator.isStarted()" into mnc-dev 2015-06-10 14:27:47 +00:00
Paul Lawrence
05487618c1 Remove hex encoding and password adjusting now that patterns are '1' based 
Bug: 21606650
Change-Id: Id2b01d43edcb995a9bffbc990e6297940e81f20e
 2015-06-10 07:21:19 -07:00
Jason Monk
6ff98ce2c8 Fix work apps showing as not installed for owner 
Bug: 21717956
Change-Id: Ia00537f3b50f958a2e35094abf1bfc73dc1f79af
 2015-06-10 10:18:22 -04:00
Chris Wren
300a141650 Merge changes from topic 'tron' into mnc-dev 
* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 14:14:41 +00:00
Geoff Mendal
b381bcc185 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:10:00 +00:00
Geoff Mendal
d86ab3b324 Import translations. DO NOT MERGE 
Change-Id: I43d33e6e42b0bbeeec7cc330bbb9c068fa3828d2
Auto-generated-cl: translation import
 2015-06-10 09:04:16 -05:00
Michael Wright
7a629cc78e Fix order of initialization arguments for obtained MotionEvents. 
Bug: 21330711
Change-Id: I308f7675d2730210228a0c01856616ce07d6374e
 2015-06-10 15:02:10 +01:00
Geoff Mendal
36eb6d5f46 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 14:00:34 +00:00
Geoff Mendal
b6c026bec1 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:59:02 +00:00
Geoff Mendal
a126f69419 Import translations. DO NOT MERGE 
Change-Id: I20b6c72047df24a7b6f9ad21db1234bdc4889925
Auto-generated-cl: translation import
 2015-06-10 08:58:30 -05:00
Geoff Mendal
1947d9f55e Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 13:57:32 +00:00
Geoff Mendal
09e34e989c Import translations. DO NOT MERGE 
Change-Id: I8f8557a777e3b2ed58593aa20d1a2b0f2a5aa33b
Auto-generated-cl: translation import
 2015-06-10 08:55:37 -05:00
Geoff Mendal
c960f3aa34 Import translations. DO NOT MERGE 
Change-Id: Id91c1fc06d73c8f99d53a5fce6d08ef9922b5d07
Auto-generated-cl: translation import
 2015-06-10 08:52:40 -05:00
John Spurlock
0265657d7f Volume: Show row headers for cast streams. 
Change-Id: Icbdc336ee7fd53494eab4b5c54c693504b816b29
 2015-06-10 09:34:32 -04:00
Abodunrinwa Toki
7aa6d0a4b1 Change FloatingToolbar entry/exit animations to fadeIn/fadeOut. 
Bug: 21307167
Change-Id: I7f75e064c264666ad0e8f84d5421fcc15176ee3f
 2015-06-10 13:45:25 +01:00
Neil Fuller
8e095594a6 Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 2015-06-10 12:23:54 +00:00
Andrew Flynn
da9bbf7255 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-10 11:41:32 +00:00
Andrei Stingaceanu
1c96a94184 Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev 2015-06-10 11:19:18 +00:00
Alex Chau
ccfa54f4a2 Merge "Add strings for notification shown upon work profile deletion" into mnc-dev 2015-06-10 10:44:02 +00:00
Alex Chau
9c8d2b0620 Add strings for notification shown upon work profile deletion 
Bug: 18543323

Change-Id: I87713da6684044b95b2e6c38882e20fe798f8deb
 2015-06-10 11:42:14 +01:00
Chet Haase
4ddd9257d6 Clarify docs for Animator.isStarted() 
Behavior is different than spec'd for one-shot animators, clarified
docs to reflect that.

Issue #21087798 better docs for isStarted()

Change-Id: I499a5d52cf02ef715acb6ae0635ede4328c93de8
 2015-06-10 10:42:50 +01:00
Chris Banes
d9b0acd2eb Merge "Fix location for ActionMenuItemView cheat sheet" into mnc-dev 2015-06-10 08:12:51 +00:00
The Android Automerger
a8685ffc74 merge in mnc-release history after reset to mnc-dev 2015-06-10 01:01:59 -07:00
Martijn Coenen
706f23ddb9 Merge "Make peer LLCP version an int." into mnc-dev 2015-06-10 06:58:20 +00:00
Martijn Coenen
bdc34b8440 Make peer LLCP version an int. 
And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
 2015-06-10 08:49:02 +02:00
Jeff Sharkey
e687929f33 Merge "Flags to select storage volume for app installs." into mnc-dev 2015-06-10 04:43:18 +00:00
Jeff Sharkey
ab2340996a Flags to select storage volume for app installs. 
Remote callers can now provide the "--install-location" value from
the APK to help select a location, or they can explicitly force a
volume by UUID.

Bug: 21676789
Change-Id: Iefc92d770a851fc33e37edbf259fdb8df2b14ae5
 2015-06-09 21:42:22 -07:00
Dmitriy Ivanov
44a2d978d1 Fix abi-detection for 32-bit system apps 
Some system apps are still special and use symlinks
to /system/lib. For these apps we try to detect abi
based on directory structure if detecting abi the
regular way was failed.

Bug: 21668152
Bug: 21711506
Change-Id: Ic048e5f4c24d06ca2cb917d7a061a41bde597e9f
 2015-06-09 21:18:44 -07:00
Yao Chen
a0d41262d4 Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev 2015-06-10 03:28:29 +00:00
Jeff Brown
fe4ad335d8 Support 4K overlay displays. 
Bug: 18241736
Change-Id: Ibd479f2ea47ed49a507e7265bdce83afc214b19c
 2015-06-09 19:52:23 -07:00
Adrian Roos
5b7793cacf Merge "Expand scrim all the way to the right" into mnc-dev 2015-06-10 01:29:56 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Adrian Roos
2f2bd9a8f8 Expand scrim all the way to the right 
Fixes a bug where the scrim would not cover
the area occupied by the nav bar which looks weird
when the nav bar is hidden.

Bug: 19582019
Change-Id: I7d96ca46a41ec764984be5fe42d225cb94f53497
 2015-06-10 01:29:12 +00:00
Adrian Roos
9454847618 Merge "Add content description to keyguard user avatar" into mnc-dev 2015-06-10 01:28:31 +00:00
Svetoslav
970b59cbe3 Use who when requesting permissions 
Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
 2015-06-09 18:17:44 -07:00
Adrian Roos
ffc9097d10 Add content description to keyguard user avatar 
Bug: 20535812
Change-Id: I32ff0878c2332681ebd848c9da6e2dc42363b9be
 2015-06-09 18:09:49 -07:00
Chien-Yu Chen
bf2d55b2b5 Camera2: Clarify capture order for reprocess 
Clarify the order of regular and reprocess requests in capture()
and captureBurst().

Bug: 21558022
Change-Id: I6bc3eda9614e43a954540ad271b4145a4dbcc8f2
 2015-06-09 18:09:11 -07:00
Dianne Hackborn
113769d70b Merge "Fix NPE." into mnc-dev 2015-06-10 01:06:29 +00:00
Lajos Molnar
53858ced4c Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev 2015-06-10 01:04:50 +00:00
Adrian Roos
dbcf0a9e7d Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 2015-06-10 01:02:48 +00:00
Dianne Hackborn
c0cdfa5947 Fix NPE. 
Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
 2015-06-09 17:53:47 -07:00