Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,557 Commits 3 Branches 0 Tags
e5facf356b3754e3c598a736694b6691b6c78fa2
Commit Graph

46523 Commits

Author SHA1 Message Date
Andreas Gampe
2cabf4a93d Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-19 00:20:49 +00:00
Rubin Xu
3c1d5e2f9d am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '40603baa3ec570b1cb423e3488125b1dd35cb5e9':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:19:50 +00:00
Chris Craik
51888ef85d am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit 'df57b22bc679664138079a4f15966b19f63f0aea':
  Update clipToPadding docs
 2014-11-19 00:19:34 +00:00
Adam Powell
3df1a1da42 resolved conflicts for merge of d8435643 to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4669691dd50e400d79e1bc1e54d2e53bcd35a56
 2014-11-18 16:12:28 -08:00
Rubin Xu
40603baa3e am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:09:43 +00:00
Chris Craik
df57b22bc6 am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit '0455174d347bf451e830584bc3f6f35c3c560282':
  Update clipToPadding docs
 2014-11-19 00:09:32 +00:00
Rubin Xu
735f22850e Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 2014-11-18 23:43:17 +00:00
Chris Craik
0455174d34 Merge "Update clipToPadding docs" into lmp-mr1-dev 2014-11-18 23:33:30 +00:00
Adam Powell
d843564331 Merge "PopupWindow: fix typo in doc comment" 2014-11-18 23:32:57 +00:00
Chris Craik
de81cf0c31 am 22e8e8ef: am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 
* commit '22e8e8ef57ecef6fe7b3489c3c16babfda017435':
  Fix missing ellipsis when just one character is truncated
 2014-11-18 22:25:39 +00:00
Chris Craik
22e8e8ef57 am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 
* commit 'bde9ffbd56cb420b51f11ca05b5225c1953f048d':
  Fix missing ellipsis when just one character is truncated
 2014-11-18 22:20:48 +00:00
Chris Craik
bde9ffbd56 Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev 2014-11-18 22:17:35 +00:00
Abhijith Shastry
ef5c2d53a6 am cc472e66: am 6807e5f0: Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 
* commit 'cc472e66ef4ab6dc7e369bbf2c9da737bea98a39':
  Adding more javadocs to Carrier messaging API.
 2014-11-18 22:16:30 +00:00
Abhijith Shastry
cc472e66ef am 6807e5f0: Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 
* commit '6807e5f0feac3cfc85e9fe74378b94bc32a141c5':
  Adding more javadocs to Carrier messaging API.
 2014-11-18 22:10:09 +00:00
Abhijith Shastry
6807e5f0fe Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 2014-11-18 22:04:58 +00:00
John Reck
de620d06ff am 51ce9cac: am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev 
* commit '51ce9cacb66d1ddac115c15375ca174d8b3eaf79':
  Don't invalidate() on setClipBounds
 2014-11-18 21:51:40 +00:00
John Reck
51ce9cacb6 am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev 
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
  Don't invalidate() on setClipBounds
 2014-11-18 21:46:44 +00:00
John Reck
cff98630e7 am fcd38813: am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev 
* commit 'fcd38813efad32f13d472ef6e99e47b3b9db8f28':
  Fix invalidateOutline
 2014-11-18 21:45:13 +00:00
John Reck
37cdc191e3 Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev 2014-11-18 21:41:17 +00:00
John Reck
fcd38813ef am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev 
* commit '3cf61d4b79a22f89b8fb839ef9ee2146fac4e703':
  Fix invalidateOutline
 2014-11-18 21:37:40 +00:00
John Reck
3cf61d4b79 Merge "Fix invalidateOutline" into lmp-mr1-dev 2014-11-18 21:30:48 +00:00
Sander Alewijnse
476e3c3904 am 0af82f65: am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev 
* commit '0af82f65d311787688a8bb634a47f24dec3138ab':
  Rename the dont_disable_system_apps constant.
 2014-11-18 19:35:24 +00:00
Sander Alewijnse
0af82f65d3 am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev 
* commit '0925db87150300a679090a41f6eec26aad5c75e5':
  Rename the dont_disable_system_apps constant.
 2014-11-18 19:30:46 +00:00
Sander Alewijnse
0925db8715 Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev 2014-11-18 19:28:17 +00:00
Dianne Hackborn
dde2ecc118 am 7ff92f42: am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev 
* commit '7ff92f420e0f32149bcb80698db6108d9e5aaa53':
  Add time estimates to batterystats dump.
 2014-11-18 18:51:50 +00:00
Dianne Hackborn
7ff92f420e am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev 
* commit '9522055f1d10b30158b772885bf4befe06fb2a08':
  Add time estimates to batterystats dump.
 2014-11-18 18:46:52 +00:00
Dianne Hackborn
ad6a99b32a Add time estimates to batterystats dump. 
Also fix some java docs.

Change-Id: Ie705f236db6f06e34fa5581c20852e5c8f7c2c17
 2014-11-18 10:41:09 -08:00
Alan Viverette
0d9a3691e8 am 8b9df16f: am 68235e4d: Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev 
* commit '8b9df16f2db6ee7c37d6d4b759109e45fe7d123e':
  Prevent NPE when computing FastScroller position with no visible items
 2014-11-18 18:22:02 +00:00
Rubin Xu
a97855b784 Remove permission check in DevicePolicyManager.isUninstallBlocked() 
This is to allow Play to use this API to find out whether a package
is uninstallable due to profile or device owner policy's restriction.

Bug: 17914630
Change-Id: I4ce2963884ecdf3306805f36db80ed1ebf04d88f
 2014-11-18 17:53:46 +00:00
Alan Viverette
8b9df16f2d am 68235e4d: Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev 
* commit '68235e4dbca1a51fa7df7ca5d2a68c8e4b3d541c':
  Prevent NPE when computing FastScroller position with no visible items
 2014-11-18 17:52:42 +00:00
Alan Viverette
68235e4dbc Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev 2014-11-18 17:46:52 +00:00
George Mount
b08f41d11d am d5b03769: am 6cb51968: Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev 
* commit 'd5b03769767522e6c02587269a39eeb030e09672':
  Fix Visibility transitions canceling when nothing has changed.
 2014-11-18 15:36:49 +00:00
George Mount
d5b0376976 am 6cb51968: Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev 
* commit '6cb51968c205e84d6ba730d73c3aaf00ccf8c649':
  Fix Visibility transitions canceling when nothing has changed.
 2014-11-18 15:32:53 +00:00
George Mount
6cb51968c2 Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev 2014-11-18 15:29:48 +00:00
Sander Alewijnse
5a1442589f Rename the dont_disable_system_apps constant. 
Bug:18414080
Change-Id: Ief9c6ac4346ab0588514f89a659fcb09d10d6574
 2014-11-18 13:25:04 +00:00
Griff Hazen
e394c1d108 am 89f02249: am 9c5be4ed: Improve doc for {get,set}HintAvoidBackgroundClipping 
* commit '89f02249970dc3058e1b38402f1fb64c614bafad':
  Improve doc for {get,set}HintAvoidBackgroundClipping
 2014-11-18 02:27:23 +00:00
Andres Morales
046c7b2d55 am e261ede8: am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 
* commit 'e261ede827664bdb0f115edb5af25e590a36557e':
  Add UserHandle to BeamShareData
 2014-11-18 02:05:51 +00:00
Jeff Davidson
704b7521b1 am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '0e7848748256f4b5709a4c94882e20d96a86ae8e':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-18 02:05:29 +00:00
Griff Hazen
89f0224997 am 9c5be4ed: Improve doc for {get,set}HintAvoidBackgroundClipping 
* commit '9c5be4eddd1607846c189e403fd74fd288ce7976':
  Improve doc for {get,set}HintAvoidBackgroundClipping
 2014-11-18 01:56:57 +00:00
Griff Hazen
9c5be4eddd Improve doc for {get,set}HintAvoidBackgroundClipping 
Bug: 18414403
Change-Id: I4cc069ca8f13d7521aa94e3c18f776de69280e2f
 2014-11-17 17:47:50 -08:00
John Reck
9029e5ecd0 Don't invalidate() on setClipBounds 
Bug: 17510133

This is a RenderNode property now, so use
the faster invalidateViewProperty() shortcut
since a re-record isn't necessary

Change-Id: If3999bce9a1fb9b60e42f0ee624bb554361f96ac
 2014-11-17 15:28:55 -08:00
Andres Morales
e261ede827 am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 
* commit '5aadd5b6fa8ee9f09cd4870c8f104c1e611aebcd':
  Add UserHandle to BeamShareData
 2014-11-17 22:58:40 +00:00
Jeff Davidson
0e78487482 am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '9a1da68bf7980449a5ee5d6fa9d9686b04d667ff':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-17 22:58:12 +00:00
Andres Morales
5aadd5b6fa Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 2014-11-17 21:53:58 +00:00
Christopher Tate
f75301f7b1 am 93fb1553: am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev 
* commit '93fb155344e076d7ac2dfc5570c8d560c206ae0e':
  Don't crash just because invalid datasets were offered for restore
 2014-11-17 21:05:10 +00:00
Jeff Davidson
9a1da68bf7 Expose a SystemApi method to prepare a VPN without consent. 
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
 2014-11-17 21:03:10 +00:00
Christopher Tate
93fb155344 am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev 
* commit '94d963381d7bd75e60da1c3038c7970e47d2ac35':
  Don't crash just because invalid datasets were offered for restore
 2014-11-17 20:59:46 +00:00
John Reck
c99d3c99f8 Fix invalidateOutline 
Bug: 18175261

invalidateOutline was switched to a lazy-method, but this doesn't
work because invalidateViewProperty intentionally does not
do a traversal, therefore the invalidate was never consumed.

However it was attempting to be lazy about work that is cheap to
do, so nuke the lazy aspect and restore invalidateOutline's previous,
correct behavior. rebuildOutline is kept to avoid triggering
traversals in places they are not needed

Change-Id: I70f8cbacd54a607c0bf0bc7fe6eea78554cb2ea3
 2014-11-17 12:35:53 -08:00
Raph Levien
396879f3f8 Fix missing ellipsis when just one character is truncated 
The "moreChars" test in StaticLayout's generate method would evaluate to
false when the last character in a word caused the break. This in turn
suppressed the ellipsis in this case. The proposed fix is always to set
moreChars true in the code path where the line is broken because more
text wouldn't fit.

Bug: 17738112
Change-Id: Ifa1a69841ca952da4d1937dc8326778179b026b3
 2014-11-17 12:32:06 -08:00
Christopher Tate
94d963381d Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev 2014-11-17 20:20:12 +00:00