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

156684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
901c36e51c am 080c4437: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit '080c443740042805b678b94f10982a41957490df':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:51:01 +00:00
Alan Viverette
68247b0303 am f680e5f2: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit 'f680e5f2820111f464f4100bb771bae0cca75518':
  Correctly apply max width/height to preference icons
 2014-09-19 22:42:02 +00:00
Alan Viverette
1183d55f48 am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'd112a2d9afb11c46d9c806d70c794cfaf972e510':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:41:56 +00:00
Dan Albert
ece13f90ed resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp 
Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4
 2014-09-19 15:37:15 -07:00
Alan Viverette
edcb2d0e89 Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 2014-09-19 22:28:08 +00:00
Ian Rogers
c058fbb5a0 am ad64befd: am 296a712e: Merge "Make a field final." 
* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
  Make a field final.
 2014-09-19 22:27:18 +00:00
Alan Viverette
b6e5a88104 am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
  Correctly apply max width/height to preference icons
 2014-09-19 22:27:16 +00:00
Alan Viverette
daf8588275 Merge "Correctly apply max width/height to preference icons" into lmp-dev 2014-09-19 22:19:02 +00:00
Alan Viverette
0fa3c1c656 Update theme colors for better contrast and de-blueing 
BUG: 17520824
Change-Id: Id9f90136cea169ba9e58db957034c539ef25121f
 2014-09-19 22:17:45 +00:00
Dan Albert
8791ebf0cd am bcaaebb8: Merge "Clean up test makefiles." 
* commit 'bcaaebb8a881951720190f4a6b9ffcbf871542af':
  Clean up test makefiles.
 2014-09-19 22:14:38 +00:00
Ian Rogers
ad64befd25 am 296a712e: Merge "Make a field final." 
* commit '296a712e6b3fd48b5ace1128fa68547fdb8de84d':
  Make a field final.
 2014-09-19 22:14:33 +00:00
Svetoslav
dacb58d6f6 am 5b119d7d: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '5b119d7db1ccce7aef5230020ddc00fee858d573':
  Keep existing API behavior that regressed.
 2014-09-19 22:02:13 +00:00
Dianne Hackborn
df0f7082dc am 0f10194f: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit '0f10194ff90ac1efc8c8ef3f17dbb7c74d2e9da1':
  Add new activity dumpsys command to persist all data.
 2014-09-19 22:02:06 +00:00
Svetoslav
88c3beee0e am 0569b336: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit '0569b336edd58c5c02023ae250057fd8bdbd593a':
  Fix a print spooler crash when printing.
 2014-09-19 22:02:00 +00:00
Svetoslav
17a09b2b83 am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit '35abe50d89e8dedecf6a3c66c3b6bfe9f904528d':
  Keep existing API behavior that regressed.
 2014-09-19 21:49:32 +00:00
Dianne Hackborn
b30fd631a7 am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit 'cb2775a7f11575b355cf8913b15c37f4b8924f79':
  Add new activity dumpsys command to persist all data.
 2014-09-19 21:49:27 +00:00
Svetoslav
8b91705169 am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit 'a2201272b5b27f3ac9cf90d6332e81fb474c1dbb':
  Fix a print spooler crash when printing.
 2014-09-19 21:49:16 +00:00
Svetoslav
1258dd2142 Merge "Keep existing API behavior that regressed." into lmp-dev 2014-09-19 21:41:39 +00:00
Dianne Hackborn
79572afb33 Merge "Add new activity dumpsys command to persist all data." into lmp-dev 2014-09-19 21:41:39 +00:00
Svetoslav
451bf37362 Merge "Fix a print spooler crash when printing." into lmp-dev 2014-09-19 21:41:12 +00:00
Svetoslav
9424b733c7 Fix a print spooler crash when printing. 
The spooler communicates with he remote PDF renderer asynchronously.
When print is confirmed we close the renderer, destroy it, and unbind
from its service. If we unbind from the service after the print activiy
is finished we get a crash. The bug was that we did not wait until we
disconnect from the remote renderer before finishing the print activity.

bug:17583115

Change-Id: I55b0135f9c5658b3a4fda2901b8b3bdef044e211
 2014-09-19 14:24:40 -07:00
George Mount
0ca952b197 am 9367ab11: am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit '9367ab119e73bbc8d1568b42818ccd248f56cc40':
  Target only shared elements with shared element Transition
 2014-09-19 21:24:05 +00:00
Jeff Sharkey
a38f9ea49f am 813142d6: am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev 
* commit '813142d6f88202835dbc475a1b7c99af265d45f2':
  Fix bugs when system apps reclaim permissions.
 2014-09-19 21:24:00 +00:00
George Mount
82aaeb6843 am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev 
* commit 'a86f10158a690b30e31216f628942562c3f2e2f2':
  Target only shared elements with shared element Transition
 2014-09-19 21:14:44 +00:00
Jeff Sharkey
35ce62ce27 am 9e8359ab: Merge "Fix bugs when system apps reclaim permissions." into lmp-dev 
* commit '9e8359abf59cb36fb1e15b310ff7d81efc6ce057':
  Fix bugs when system apps reclaim permissions.
 2014-09-19 21:14:38 +00:00
Alan Viverette
f0311b3c27 am f559e395: am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev 
* commit 'f559e39506a4e8b1b8d42038d2681ddd3724d495':
  Fix action bar title size consistency
 2014-09-19 21:11:57 +00:00
George Mount
615a2c1605 Merge "Target only shared elements with shared element Transition" into lmp-dev 2014-09-19 21:01:15 +00:00
Svetoslav
b624244325 Keep existing API behavior that regressed. 
If RemoteViews get a null package in the constructor we are
using the context in which they are applied to obtain resources
during inflation. In such a case if we call the getPackage()
method we were getting null, i.e. the package passed in the
contructor, but now we are returning the package if the app
that created the remote views.

bug:17513823
Change-Id: I0c4a8953c8320469a9160dbaae46ce31465b313b
 2014-09-19 13:59:10 -07:00
Jeff Sharkey
804d37fd57 Merge "Fix bugs when system apps reclaim permissions." into lmp-dev 2014-09-19 20:58:45 +00:00
Alan Viverette
c73129dd60 am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev 
* commit 'bac2a4be9a4a408fb6adbd59b0632e2b87bf3872':
  Fix action bar title size consistency
 2014-09-19 20:57:40 +00:00
Adam Powell
dca6740355 am 8040e47d: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '8040e47d83e3fe2c1d28c2dcbfbd80fd5cc0b26f':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:53:01 +00:00
Alan Viverette
e14566eeb1 Merge "Fix action bar title size consistency" into lmp-dev 2014-09-19 20:51:14 +00:00
Adam Powell
f03d57ac9f am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '20ffcaa121cb214ed875f4940e9ba16e82850a56':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:40:47 +00:00
Alan Viverette
ecd7c96aa4 Correctly apply max width/height to preference icons 
BUG: 17581750
Change-Id: I8ad21a321c80f0a657670ba4d175d0ebecea49ef
 2014-09-19 13:36:29 -07:00
Adam Powell
17f48457d2 Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 2014-09-19 20:31:14 +00:00
Michael Wright
296519e8ca am c3c44743: am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit 'c3c44743bca36ba72ccaa581eb3f15fff8b23a0a':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 20:20:01 +00:00
Michael Wright
743bfe846c am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 
* commit '66bbf591050bf2969ebebc15e2550d45eeea3ab0':
  Respect intent-filter priority for system keyboard layouts.
 2014-09-19 20:05:13 +00:00
Dianne Hackborn
ce0fd7665f Add new activity dumpsys command to persist all data. 
Very useful for testing persisting/restoring, to make sure
that all pending changes have been written.

Change-Id: I0e3b7cd3af8afb0b6e751e086081566ab00b76c9
 2014-09-19 12:58:15 -07:00
George Mount
2deeaa3314 Target only shared elements with shared element Transition 
Bug 17549213
Bug 17553253

Change-Id: If54aebb4e37d2012aa8d1c5354d5ec03f92b81a3
 2014-09-19 12:55:20 -07:00
Michael Wright
4bc92b064b Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev 2014-09-19 19:52:54 +00:00
Adam Powell
c6c744da75 Add colorEdgeEffect to themes, default it to colorPrimary 
Allow edgeeffect colors to be changed independently of the primary
color for the current theme.

Bug 16512225

Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
 2014-09-19 12:50:31 -07:00
Jason Monk
eaa56fde5a am 0cbb361d: am 99b33ccb: Merge "Fix crash in PacManager" into lmp-dev 
* commit '0cbb361d35c22a831a41308ec2161876d4949305':
  Fix crash in PacManager
 2014-09-19 19:49:37 +00:00
Alan Viverette
7c7e3ba312 am c17a38b1: am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit 'c17a38b12d936885a9867e92e40d6e740f2d98f4':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 19:36:07 +00:00
Paul Soulos
ba82711e96 am 18b86cc6: am b5586e00: Fixes typo in Intent documentation 
* commit '18b86cc685658142fd20e88baa52817100ea0daf':
  Fixes typo in Intent documentation
 2014-09-19 19:36:02 +00:00
Nancy Chen
f5b168f53f am ca4769ab: am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev 
* commit 'ca4769ab97d5851abb82a9f3cbb5ad4fda77fa23':
  Add constructor for DisconnectCause that does not require a tone.
 2014-09-19 19:35:44 +00:00
Jason Monk
81b1baacfe am 99b33ccb: Merge "Fix crash in PacManager" into lmp-dev 
* commit '99b33ccbbf0d0c2d6c75babccee1def614f93008':
  Fix crash in PacManager
 2014-09-19 19:34:09 +00:00
Jason Monk
f6edc55e6a Merge "Fix crash in PacManager" into lmp-dev 2014-09-19 19:25:47 +00:00
Alan Viverette
f185dce7f2 am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev 
* commit '40994e66f278da83e2e4e581c85d5092ee1fb1c0':
  Fix radial time picker inner circle (1-12) selections
 2014-09-19 19:24:37 +00:00
Paul Soulos
8e3d31bdc5 am b5586e00: Fixes typo in Intent documentation 
* commit 'b5586e00ed5eb4b18b58371a54449f9cc8eedca8':
  Fixes typo in Intent documentation
 2014-09-19 19:24:33 +00:00
Nancy Chen
5b5a704646 am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev 
* commit '6f2712513c83a2f13bf6376182edabbf022da890':
  Add constructor for DisconnectCause that does not require a tone.
 2014-09-19 19:24:28 +00:00