Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,228 Commits 3 Branches 0 Tags
4221126b95db7fc81e4735a18a92aa40621bd2af
Commit Graph

44012 Commits

Author SHA1 Message Date
Rubin Xu
4221126b95 am 3c1d5e2f: am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '3c1d5e2f9d0724f0a10313244d0ef47957d855f2':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:24:13 +00:00
Chris Craik
22da9ba481 am 51888ef8: am df57b22b: am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev 
* commit '51888ef85d1350217297cb704dac80d45a1845e9':
  Update clipToPadding docs
 2014-11-19 00:24:04 +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
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
Abhijith Shastry
2070a2cdc8 am ef5c2d53: am cc472e66: am 6807e5f0: Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev 
* commit 'ef5c2d53a64e17acbf12c311136c0af53b59983d':
  Adding more javadocs to Carrier messaging API.
 2014-11-18 23:05:55 +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
608c245ba7 am de620d06: am 51ce9cac: am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev 
* commit 'de620d06ffe3570f7a4548db22428aa7ba37b252':
  Don't invalidate() on setClipBounds
 2014-11-18 22:00:07 +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
c773f42858 am cff98630: am fcd38813: am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev 
* commit 'cff98630e75eda78864c3f2559fa2023e1fae749':
  Fix invalidateOutline
 2014-11-18 21:51:07 +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
292f3ad918 am 476e3c39: am 0af82f65: am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev 
* commit '476e3c3904b3e8a8870b0b32a2cff3f03f2e8772':
  Rename the dont_disable_system_apps constant.
 2014-11-18 20:22:49 +00:00
Dianne Hackborn
47acc8f535 am dde2ecc1: am 7ff92f42: am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev 
* commit 'dde2ecc118a56cd4100a29a1dd1c1697b6f56353':
  Add time estimates to batterystats dump.
 2014-11-18 20:22:20 +00:00
Alan Viverette
d5408ad4b4 am 0d9a3691: am 8b9df16f: am 68235e4d: Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev 
* commit '0d9a3691e89f8160c9edd15ab9b927435a2069e1':
  Prevent NPE when computing FastScroller position with no visible items
 2014-11-18 20:21:41 +00:00
George Mount
fbad078408 am b08f41d1: am d5b03769: am 6cb51968: Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev 
* commit 'b08f41d11df044a55a496576f6ccd088c24fae08':
  Fix Visibility transitions canceling when nothing has changed.
 2014-11-18 20:20:45 +00:00
Griff Hazen
20f9280bd5 am e394c1d1: am 89f02249: am 9c5be4ed: Improve doc for {get,set}HintAvoidBackgroundClipping 
* commit 'e394c1d108499885599b046521c69d915c8f5a8f':
  Improve doc for {get,set}HintAvoidBackgroundClipping
 2014-11-18 20:19:03 +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
Andres Morales
1fdb441d43 am 046c7b2d: am e261ede8: am 5aadd5b6: Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 
* commit '046c7b2d553fb59f3520073380fce89cfa960e2d':
  Add UserHandle to BeamShareData
 2014-11-18 02:31:22 +00:00
Jeff Davidson
19222147fc am 704b7521: am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '704b7521b19d654c49c7804e6079aec3f2c69838':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-18 02:31:02 +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