Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
d86d7bce78 Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev 2014-10-29 21:14:56 +00:00
Santos Cordon
d9e614fd56 More updates to javadocs for Telecom APIs. 
Change-Id: I8f8389f521c0d654c9bfdc3ad9670be0d118f480
 2014-10-29 14:13:00 -07:00
Vladimir Marko
85d6f29994 Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev 2014-10-29 21:12:08 +00:00
Svetoslav
7c053c1e41 Print preview disappearing if printer is changed. 
This is a regression caused by my previous patch.

Change-Id: I80a0b4d880fd4e48e6a44fac303a4c8204e8ec0d
 2014-10-29 13:50:42 -07:00
Calin Juravle
be312e43ab am bd705e5e: am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit 'bd705e5ed1906332a66b12b1b64acbe44da869f0':
  Use native brige only if we have a private data directory.
 2014-10-29 20:47:57 +00:00
Ricardo Cervera
5f79d17a6b docs: Fix the circularReveal example. 
Change-Id: Iac7cab08c179f7f5318ba0e5ed6bad1dd2b29b4e
 2014-10-29 13:43:57 -07:00
Chris Wren
755f4021ae fix build break from mis-named DEBUG flag in SystemUI 
Change-Id: I55459fe090ae4c159ebdad8b60658b25db29271e
 2014-10-29 16:43:51 -04:00
Calin Juravle
bd705e5ed1 am 5d5e4b14: am 43a92646: Merge "Use native brige only if we have a private data directory." 
* commit '5d5e4b14f67903370a7805492eb92fbe3b487a14':
  Use native brige only if we have a private data directory.
 2014-10-29 20:41:55 +00:00
Vladimir Marko
c1bcdbb758 Fix android_media_AudioSystem_getMasterMute return type. 
Caused FPU stack overflow on x86.

Bug: 18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192
 2014-10-29 20:34:15 +00:00
Chris Wren
b7efa04d52 Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev 2014-10-29 19:54:52 +00:00
Alan Viverette
d513379239 Update drawable state after updating tint list 
BUG: 18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
 2014-10-29 19:46:54 +00:00
Narayan Kamath
fd79e9f3c3 am 3cad510e: am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '3cad510e271d4e9510d0f15560c4979071c8436c':
  Suppress Clang compilation warnings.
 2014-10-29 19:42:18 +00:00
Narayan Kamath
f0c7066742 am 78b3f5ab: am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit '78b3f5ab70300548776e3b98ee6d8fb6b1f5318f':
  Revert "Remove unused apache related API."
 2014-10-29 19:42:13 +00:00
Elliott Hughes
99e08b70aa am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
* commit 'b5ce284aa8e738de051572ab37a01d52fa7b1dac':
  Remove unused apache related API.
 2014-10-29 19:38:05 +00:00
Andre Eisenbach
e2502eb9ad Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev 2014-10-29 19:35:19 +00:00
Narayan Kamath
3cad510e27 am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master 
* commit '4ed472ab33e78391c0b084ed3908019e06b7dfe5':
  Suppress Clang compilation warnings.
 2014-10-29 19:34:32 +00:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Andre Eisenbach
178d3b54cd Fix crash during Bluetooth on/off stress test 
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
 2014-10-29 12:13:38 -07:00
David Friedman
543a82edd5 am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '51209aa38ee9895c639fbbb6f469f926f3c66b7f':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 18:52:29 +00:00
Deepanshu Gupta
5456230d3b am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '03b100e11dad5bef34e71ccfd45b6c7adc9bfee4':
  Add missing delegate for AnimatorInflater.
 2014-10-29 18:52:21 +00:00
Geoff Mendal
9bff44bdc4 am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '39ae5dd786aff204888457a648ed291926e33334':
  Import translations. DO NOT MERGE
 2014-10-29 18:52:13 +00:00
Geoff Mendal
2c5e5ef50c am c88fbd3c: (-s ours) Import translations. DO NOT MERGE 
* commit 'c88fbd3cce87f67aad17c636b9e23b4e29afac6a':
  Import translations. DO NOT MERGE
 2014-10-29 18:52:00 +00:00
Wink Saville
0d1356c4f1 am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f7543b40d25db5cc089a4cadea6c1444a56d3b25':
  Import translations. DO NOT MERGE
 2014-10-29 18:51:49 +00:00
Deepanshu Gupta
bf59e8974d am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev 
* commit 'de4ee0f1be350a52d642a447269a91f6d28e73fc':
  Skip loading animations.
 2014-10-29 18:51:32 +00:00
Deepanshu Gupta
122ccfb08f am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev 
* commit '916d779650352059b08b7257f71a7aab8b333eba':
  Fix multiple styles case in resource resolution.
 2014-10-29 18:51:28 +00:00
Deepanshu Gupta
62cf56cf99 am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev 
* commit '6fb2fda85c410e23a1b9366c025fe288447bf027':
  Use right theme for drawable inflation.
 2014-10-29 18:51:23 +00:00
Chris Wren
79ac09e439 Add logging to diagnose notification click issue. 
Bug: 18102199
Change-Id: Id022faa7b75f28f446155f15ab4a8373869c163c
 2014-10-29 14:38:01 -04:00
David Friedman
51209aa38e am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '43582423ee64b4d1e8f0186e34494cc7f7519488':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 18:20:19 +00:00
David Friedman
43582423ee am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release. 
* commit '0fa6edced7496b898d31ff7dab7255a1e0dffa9b':
  Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
 2014-10-29 18:15:31 +00:00
Alan Viverette
2b12b58f94 Create translucent hardware renderer if surface insets are non-zero 
BUG: 18160604
Change-Id: Ie4483b9841bd91778659d83b154f69e777fa1dfc
 2014-10-29 11:11:40 -07:00
Alan Viverette
3abf5c4bd1 Use action mode context for ActionMode menu inflater 
BUG: 18078900
Change-Id: Iff837e741dde79a565f1e8c83846ee6155da179e
 2014-10-29 11:03:35 -07:00
Narayan Kamath
cb383183d7 Fix getPackageInfo("android") in the system server. 
The fix for bug 16555230 attempted to return the same LoadedApk
object between the system context object and the activity thread's
list of opened packaged. This ensured that we used the same classLoader
on both these objects (among other things).

However, the object the Context owns is actually incomplete (and
necessarily so) because it might be created before the package
manager is and we need the package manager to construct a complete
LoadedApk object.

Work around this by manually setting the classloader and aInfo for
"android" contexts created by the system server's activity thread.

bug: 18167468
Change-Id: I623634f912111f89eaf716b8258d1926d2513dcd
 2014-10-29 18:02:29 +00:00
Alan Viverette
7a0ae7ed31 Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev 2014-10-29 18:00:12 +00:00
Narayan Kamath
99562bf065 am 7192f0d2: am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '7192f0d2acafb2599988d463a42a2dcfd80c25bc':
  Remove tests/SslLoad.
 2014-10-29 17:56:07 +00:00
Andreas Gampe
174ac568cb am 955bee89: am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
* commit '955bee89abada8b6541f499c686376d4434242b1':
  Stop using apache http to download Gps XTRA data.
 2014-10-29 17:56:03 +00:00
Calin Juravle
e41c4f2cbb am 263829e0: am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit '263829e0e794f48335db2f49078c53fe10292e98':
  PreInitializeNativeBridge only if its Available
 2014-10-29 17:55:58 +00:00
Deepanshu Gupta
03b100e11d am 617e8097: Add missing delegate for AnimatorInflater. 
* commit '617e809731d775d9e05758689bab024e34c9afbf':
  Add missing delegate for AnimatorInflater.
 2014-10-29 17:52:04 +00:00
Narayan Kamath
7192f0d2ac am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a':
  Remove tests/SslLoad.
 2014-10-29 17:47:15 +00:00
Andreas Gampe
955bee89ab am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
* commit 'dfdc6acc4809f395b9db2136acc89b6de932a1a5':
  Stop using apache http to download Gps XTRA data.
 2014-10-29 17:47:10 +00:00
Calin Juravle
263829e0e7 am 5d4deb82: am f7d24d24: Merge "PreInitializeNativeBridge only if its Available" 
* commit '5d4deb8246b13531a6b2b7611c650ba504e44dc6':
  PreInitializeNativeBridge only if its Available
 2014-10-29 17:47:03 +00:00
Dianne Hackborn
8e5aafe57d Condense AndroidRuntime init log, include uid running under. 
Change-Id: Ifda3001fdc25d759f07a93b8569c59da89a8bcfc
 2014-10-29 10:45:25 -07:00
Elliott Hughes
7070b1a8d0 am 64a1a901: am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit '64a1a901dcd9b3103cc63d5c20de9af6db9d1ada':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-29 17:37:29 +00:00
Craig Mautner
0a6b5bbd15 am 177f91d1: am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master 
* commit '177f91d1ede0cef9fc6c7c29f163b78467c49f8c':
  Doesn't re-sort app windows when move task to top
 2014-10-29 17:37:25 +00:00
Rich Slogar
eeba550cb3 docs: navigation and download updates 
Change-Id: I1bc7613d1ab484118a146f51ee5f22584b9d2a6b
 2014-10-29 10:35:27 -07:00
Yigit Boyar
fe6d57c366 Move all actionbar related methods to DecorToolbar 
Bug: 17999561

Change-Id: I36af443cf245aedd64a079726c1a2e6f6068f221
 2014-10-29 17:34:45 +00:00
Geoff Mendal
a8b0e39d8d Merge "Import translations. DO NOT MERGE" 2014-10-29 17:24:48 +00:00
Alan Viverette
d21fd9d1cc Add theme and config change support to more Drawable types 
BUG: 16045735
Change-Id: Ic03173a1c1779c1bb545c4c389f77afed97011ee
 2014-10-29 10:24:42 -07:00
Andre Eisenbach
db41880dd3 Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev 2014-10-29 17:24:05 +00:00
Geoff Mendal
39ae5dd786 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-29 17:23:52 +00:00