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

134360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruchi Kandoi
724b2e184d am 75cd3fa4: Merge "Vibrator: Minor coding style changes." 
* commit '75cd3fa4e11438e5a758c186df4cbac36f4757a1':
  Vibrator: Minor coding style changes.
 2014-05-09 23:21:12 +00:00
Winson Chung
aca960204e Fixing NPE in accessing theme attribute. 
Change-Id: I5d21645b5530f13e1709021bd818de6bdb1d6544
 2014-05-09 16:18:55 -07:00
John Reck
c42bfb95c6 Merge "Refactor VirtualLightRefBase & JNI" 2014-05-09 23:18:26 +00:00
Ruchi Kandoi
195111641c Merge "Vibrator: Minor coding style changes." 2014-05-09 23:13:07 +00:00
Chris Craik
0c0ec26366 Simplify projection matrix management. 
Store in and use from snapshot, and remove the kFlagOrthoDirty flag,
as it's redundant with kFlagIsFboLayer.

Change-Id: I2bd380192d50117f4ce1fd2058213669a886f406
 2014-05-09 16:11:14 -07:00
Ruchi Kandoi
664703d6be Vibrator: Minor coding style changes. 
Corrects the coding style errors caused by
I762be1d51eedbf3184d80ed51dc93a0d113a6d5d

Change-Id: I5adb713611f5479b21dd32ed8d8d51cb1910bca9
 2014-05-09 16:01:31 -07:00
John Spurlock
be19e65027 am 21a1c0f6: Merge "Temporary workaround for recent system UI regression." 
* commit '21a1c0f6df3943d0792d1a2612e7ac9d3571d657':
  Temporary workaround for recent system UI regression.
 2014-05-09 22:55:36 +00:00
John Spurlock
4f9d2597f8 Merge "Temporary workaround for recent system UI regression." 2014-05-09 22:51:05 +00:00
Dianne Hackborn
49e9b0ad5f am 1668b19d: Merge "Battery stats tweaks." 
* commit '1668b19d4ce7361144a6668b52434508d8311ab2':
  Battery stats tweaks.
 2014-05-09 22:43:09 +00:00
Kenny Root
70f9d49333 am 6b2350ac: Merge "WindowManagerService: add some defensive checks" 
* commit '6b2350ac016277b0cd57bda11e6137ecef34bf8f':
  WindowManagerService: add some defensive checks
 2014-05-09 22:43:03 +00:00
Chris Craik
4827dd9b25 am 6f30cc2d: am 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" 
* commit '6f30cc2db5c483a04a7b65f2fe91d317970e9112':
  Correct stride for drawing to cached glyph bitmap
 2014-05-09 22:42:47 +00:00
Andrew Solovay
c659d12774 am c9216962: am 99aa0c17: am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit 'c9216962edab701dd8e0e208c2ed299ce5d13203':
  doc: Documented how to set notification priority.
 2014-05-09 22:42:44 +00:00
John Spurlock
d0b006e21e Temporary workaround for recent system UI regression. 
Bug:14680799
Change-Id: I865c12794df2436aeee5ebd00ee1fbb7a9178594
 2014-05-09 18:42:43 -04:00
Dianne Hackborn
a90f9e435f Merge "Battery stats tweaks." 2014-05-09 22:34:36 +00:00
John Reck
9fa4071c47 Refactor VirtualLightRefBase & JNI 
Change-Id: I8e244e7109e59d5be96871b23bb9b1201c7f9eaa
 2014-05-09 15:28:54 -07:00
Selim Gurun
8267a95ed4 am f37bec2b: Merge "Cleanup remainings of old webview." 
* commit 'f37bec2bcce152f9cc787d508dd3c480f712a5e9':
  Cleanup remainings of old webview.
 2014-05-09 22:26:23 +00:00
Chris Craik
268d1cadd3 am 45bd0b7b: Merge "Fix Bitmap.cpp line endings" 
* commit '45bd0b7ba311c3f8bf1ebab8cce10c26f21a7a0b':
  Fix Bitmap.cpp line endings
 2014-05-09 22:26:19 +00:00
Ruchi Kandoi
671ef1f0db am 2a894fed: Merge "Display: Brightness: Low power mode scales the brightness to 50 percent." 
* commit '2a894fedba24b816ed930c55f28e857990f6806a':
  Display: Brightness: Low power mode scales the brightness to 50 percent.
 2014-05-09 22:26:14 +00:00
Jorim Jaggi
9d8e968789 am c1c89ade: Merge "Move Carrier label into universal status bar header." 
* commit 'c1c89ade63dd2252c77a553c92f77b3d74cebde2':
  Move Carrier label into universal status bar header.
 2014-05-09 22:26:09 +00:00
Vinod Krishnan
a58405ef46 am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master" 
* commit '027017768fb1e75aa1c5e1b4a0344b9a4b12c4e0':
  Adding a margin for the AlertDialog to work on circular UI.
 2014-05-09 22:26:04 +00:00
Lajos Molnar
cd306b4ca7 am 53e4004b: Merge "Added MediaCodec.releaseOutputBuffer() method with render timestamp" 
* commit '53e4004becc176288ed3cecdf2d9e22ec4cbf51e':
  Added MediaCodec.releaseOutputBuffer() method with render timestamp
 2014-05-09 22:26:00 +00:00
Jorim Jaggi
5565402547 am b9da12d5: Merge "Reparent status bar icons into header when expanded." 
* commit 'b9da12d5684a35126552d9736cf827369a4ebcc6':
  Reparent status bar icons into header when expanded.
 2014-05-09 22:25:47 +00:00
Alan Viverette
9edceb71d0 am 9f4c7f31: Animated state transition drawable 
* commit '9f4c7f31b47680973e4e2a23f09e4d5281a40ed0':
  Animated state transition drawable
 2014-05-09 22:25:42 +00:00
Dan Sandler
a020ef5201 am f1f778e6: Merge "Fix misaligned vectors. #cannotunsee" 
* commit 'f1f778e698db54d867ef201d260c2042ec0afc94':
  Fix misaligned vectors. #cannotunsee
 2014-05-09 22:25:38 +00:00
Yin-Chia Yeh
133fca21d7 am 91325444: Merge "Camera2: Minor update for exposureCompensation spec" 
* commit '91325444a1d7c9de947ee055ddfbac9316117234':
  Camera2: Minor update for exposureCompensation spec
 2014-05-09 22:25:30 +00:00
Jorim Jaggi
0ff8d495b3 am b94851a2: Revert "Fix measure performance of whole status bar window." 
* commit 'b94851a23050231d04a1e5bd18b0126cc85f823d':
  Revert "Fix measure performance of whole status bar window."
 2014-05-09 22:25:27 +00:00
Chris Craik
6015080ad7 am 8300cfc7: Merge "Rename matrices for consistency" 
* commit '8300cfc79f1c952b1e7e474e79cfbc1c05ae3e03':
  Rename matrices for consistency
 2014-05-09 22:25:12 +00:00
Kenny Root
e928957316 Merge "WindowManagerService: add some defensive checks" 2014-05-09 22:20:20 +00:00
Chris Craik
f9075798d7 am 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" 
* commit '90eaf92e325457ccb30286879a2f92b7ba517c7d':
  Correct stride for drawing to cached glyph bitmap
 2014-05-09 22:00:02 +00:00
Andrew Solovay
9c7fa9c090 am 99aa0c17: am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '99aa0c17d2f033590314272007fee435191ce551':
  doc: Documented how to set notification priority.
 2014-05-09 21:54:52 +00:00
Chris Craik
90eaf92e32 am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" 
* commit '7e13d1d4a46a01ebaa412d622ef76d90bd39d12a':
  Correct stride for drawing to cached glyph bitmap
 2014-05-09 21:51:49 +00:00
Selim Gurun
049803a00e Merge "Cleanup remainings of old webview." 2014-05-09 21:50:31 +00:00
Chris Craik
7e13d1d4a4 am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" 
* commit 'f6c9c4204c2f8f86277d081112c9dd863ddaa778':
  Correct stride for drawing to cached glyph bitmap
 2014-05-09 21:46:43 +00:00
Chris Craik
f6c9c4204c Merge "Correct stride for drawing to cached glyph bitmap" 2014-05-09 21:39:55 +00:00
Chris Craik
07d70172a6 Merge "Fix Bitmap.cpp line endings" 2014-05-09 21:39:48 +00:00
Ruchi Kandoi
2b3e85683d Merge "Display: Brightness: Low power mode scales the brightness to 50 percent." 2014-05-09 21:34:19 +00:00
Jorim Jaggi
1d0861dd6c Merge "Move Carrier label into universal status bar header." 2014-05-09 21:23:51 +00:00
Ruchi Kandoi
f974cc8706 Display: Brightness: Low power mode scales the brightness to 50 percent. 
When the device is in low power mode all changes to brightness will be
scaled to half of the brightness that would be normally set when not in
low power mode.

Change-Id: I03be820ef64c1d5631ded35f7dfc2799e807226b
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2014-05-09 21:17:33 +00:00
Andrew Solovay
99aa0c17d2 am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '5119f6e6db1cd7254ee71537a56bd133eb7e6a09':
  doc: Documented how to set notification priority.
 2014-05-09 21:15:10 +00:00
Vinod Krishnan
07bb4c3063 Merge "resolved conflicts for merge of 88aa8aab to master" 2014-05-09 21:11:08 +00:00
Andrew Solovay
5119f6e6db am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '3f22f22aab7d641b9d56e57a2ceec6614e09a5d8':
  doc: Documented how to set notification priority.
 2014-05-09 21:10:28 +00:00
Dianne Hackborn
37de098935 Battery stats tweaks. 
- Generate currently active events when a partial
  history is requested.
- Tag wake lock release with the wake lock name if it is
  different than the one that was acquired.
- New RESET mark for the start of the history.

Change-Id: Ic105656649c46f52855946ed0ad7f98f1d24dedc
 2014-05-09 14:07:38 -07:00
Andrew Solovay
3f22f22aab am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit 'bff632c8ff3e1f889093fcb070e86ffb19fce0ef':
  doc: Documented how to set notification priority.
 2014-05-09 21:05:06 +00:00
Andrew Solovay
bff632c8ff Merge "doc: Documented how to set notification priority." into klp-docs 2014-05-09 21:01:08 +00:00
Chris Craik
32054b0b3e Fix Bitmap.cpp line endings 
Change-Id: Icc0b067437fffaa599c92841518ad0d526112f59
 2014-05-09 13:59:36 -07:00
Lajos Molnar
0f94e3f5ed Merge "Added MediaCodec.releaseOutputBuffer() method with render timestamp" 2014-05-09 20:58:57 +00:00
Jorim Jaggi
9054d94cba Move Carrier label into universal status bar header. 
Also introduces a different height for the header area on keyguard,
as it looks better with less padding when no background is here (and
is closer to the mocks).

Change-Id: Ie9b94dcf823c3e4af83a22f5fae15d9033e146fd
 2014-05-09 22:47:28 +02:00
Lajos Molnar
7c513b6bef Added MediaCodec.releaseOutputBuffer() method with render timestamp 
Bug: 11784827
Change-Id: I67097c8e69b40ef3baa436f0e7731d28c696735c
 2014-05-09 20:43:30 +00:00
Vinod Krishnan
4a3735d081 resolved conflicts for merge of 88aa8aab to master 
Change-Id: I6d3a9885f8cf3b632267b5722e59d4968efe17f7
 2014-05-09 13:23:41 -07:00
Jorim Jaggi
f992066731 Merge "Reparent status bar icons into header when expanded." 2014-05-09 20:16:56 +00:00