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

64177 Commits

Author SHA1 Message Date
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
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
Andreas Gampe
2e706eb5b7 am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 
* commit 'f1c84568bc48d51ace404452c9e18250c4d36de4':
  Frameworks/base: Compiled-classes support
 2014-11-18 22:57:02 +00:00
Andreas Gampe
f1c84568bc am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 
* commit '2a20f425580b48ec5c130e77eb2a447731e37381':
  Frameworks/base: Compiled-classes support
 2014-11-18 22:52:25 +00:00
Andreas Gampe
12c172a801 Merge "Frameworks/base: Compiled-classes support" 2014-11-18 22:49:13 +00:00
Andreas Gampe
01dbe73976 am 8462913d: Merge "Frameworks/base: Ignore unknown pragmas in core/jni" 
* commit '8462913d0c19973901a861749b4abbaacdf4b477':
  Frameworks/base: Ignore unknown pragmas in core/jni
 2014-11-18 22:48:42 +00:00
Andreas Gampe
f59fb28cb8 Frameworks/base: Compiled-classes support 
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571

(cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff)

Change-Id: I2510316381f2661166af24d7e14b013f4e045556
 2014-11-18 14:48:31 -08:00
Andreas Gampe
2a20f42558 Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev 2014-11-18 22:45:50 +00:00
Andreas Gampe
8462913d0c Merge "Frameworks/base: Ignore unknown pragmas in core/jni" 2014-11-18 22:39:30 +00:00
Andreas Gampe
26109fd328 Frameworks/base: Ignore unknown pragmas in core/jni 
Preparation for a switch to Clang.

Change-Id: Iabe1d79474a617bec66dd4bf58002b1a372f6d23
 2014-11-18 14:38:00 -08: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
Amit Mahajan
5cb315fd0f am 51064ec6: am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit '51064ec6f0f75eb03f86d3b3fa091c857d603506':
  Telephony: STK CC feature implementation
 2014-11-18 22:04:29 +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
Amit Mahajan
51064ec6f0 am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit 'ca1e3e5e830c1e2eb63a3653117bb6c9c0589ebe':
  Telephony: STK CC feature implementation
 2014-11-18 21:56:06 +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
Amit Mahajan
ca1e3e5e83 am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 
* commit '2733ea767b691ada9faabfd41f4175d320053682':
  Telephony: STK CC feature implementation
 2014-11-18 21:51:16 +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
Amit Mahajan
2733ea767b Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev 2014-11-18 21:46:51 +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
Preeti Ahuja
d4180cc2d4 Telephony: STK CC feature implementation 
Add strings and constants required for stk cc feature.

Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
 2014-11-18 13:01:02 -08:00
Adrian Roos
02e192f6fc am 80c23e3c: am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev 
* commit '80c23e3c7f43065aabb5bf8c6f0859ba4a8c9ad7':
  Add animations for the system bar color views
 2014-11-18 20:40:10 +00:00
Adrian Roos
80c23e3c7f am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev 
* commit 'e672db2801c3eedbdf548c71dfa6cf048f91315d':
  Add animations for the system bar color views
 2014-11-18 20:32:28 +00:00
Adrian Roos
e672db2801 am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev 
* commit 'ed0976897a8d8eb1f7bf55ae25aece84b172cbb4':
  Add animations for the system bar color views
 2014-11-18 20:26:14 +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
Adrian Roos
ed0976897a Merge "Add animations for the system bar color views" into lmp-mr1-dev 2014-11-18 20:22:27 +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
Chih-hung Hsieh
b8089abb99 am d7266264: am 56090472: Merge "Use standard initializers" 
* commit 'd72662649e9a9b8ef51119fae58a17ab3deeb554':
  Use standard initializers
 2014-11-18 20:21:30 +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
Andreas Gampe
ca775941f3 Frameworks/base: Compiled-classes support 
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571
Change-Id: I2510316381f2661166af24d7e14b013f4e045556
 2014-11-18 11:48:22 -08: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