Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,335 Commits 3 Branches 0 Tags
f86468252fd4ceb5b4b0e37a4bdbcfea138cb303
Commit Graph

134335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
f86468252f am 133d4e92: Merge "Fix Os.link apicheck breakage." 
* commit '133d4e9291bb62658c6f9bf37ce914578f9d50e7':
  Fix Os.link apicheck breakage.
 2014-05-10 03:29:54 +00:00
Elliott Hughes
cd1fed2506 Merge "Fix Os.link apicheck breakage." 2014-05-10 03:26:58 +00:00
Elliott Hughes
ff3ca6f61a Fix Os.link apicheck breakage. 
Change-Id: I4fa4c21b3c373e18209ea88d72714e4f7f8a7bb4
 2014-05-09 20:25:38 -07:00
Robert Ly
d1f35190da am 49dc64d1: am 0932eb35: am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '49dc64d1a5c6f4df3e24b85bfeb52bb5e650c58b':
  docs: fix some notification code for wear stacks
 2014-05-10 03:20:22 +00:00
Robert Ly
2448b44e68 am 0932eb35: am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '0932eb35ecdf02edeeedb6656cbf1fdc5288e518':
  docs: fix some notification code for wear stacks
 2014-05-10 03:14:21 +00:00
Robert Ly
0932eb35ec am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '8028e4a063b49aadfb08fab012d2388a7466a9a1':
  docs: fix some notification code for wear stacks
 2014-05-10 02:53:28 +00:00
Robert Ly
8028e4a063 am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '1f14c107f825a9a309b396f65fbfc92a4c57eb3d':
  docs: fix some notification code for wear stacks
 2014-05-10 02:48:57 +00:00
Robert Ly
1f14c107f8 am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '0689fad8cc51e136c9c4401ef40f0a8c0abf3ea9':
  docs: fix some notification code for wear stacks
 2014-05-10 02:43:52 +00:00
Robert Ly
0689fad8cc Merge "docs: fix some notification code for wear stacks" into klp-docs 2014-05-10 02:40:40 +00:00
Adam Powell
7e53b6389a am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API"" 
* commit 'faf2e7ffa99643144db4a3857e002e6ad31be355':
  Revert "Remove the View#initializeScrollbars API"
 2014-05-10 01:55:07 +00:00
Adam Powell
17048b84ec Merge "Revert "Remove the View#initializeScrollbars API"" 2014-05-10 01:51:54 +00:00
Adam Powell
d20aa6c531 Revert "Remove the View#initializeScrollbars API" 
Looks like there are some bugs in the API checker for @removed.

This reverts commit 172c26e20fd71a2b4489a80b96ea5f6292db6430.

Change-Id: Ia4e610f71af19c5521fc019b9a6c26d0c11f23f1
 2014-05-10 01:51:27 +00:00
Adam Powell
0a2fc15370 am 82902c45: Merge "Remove the View#initializeScrollbars API" 
* commit '82902c457f76971763758c67d5ef6068d9069239':
  Remove the View#initializeScrollbars API
 2014-05-10 01:09:29 +00:00
Adam Powell
0604dbc18e Merge "Remove the View#initializeScrollbars API" 2014-05-10 01:03:52 +00:00
Adam Powell
5d4c35d1ea Remove the View#initializeScrollbars API 
This was never a safe API for apps to call since the TypedArray
parameter must have been obtained by filtering on
android.R.styleable.View, which is not public. Any behavior in the
wild has therefore been undefined.

Change-Id: Id19f571c92748ef2a8c036072fd83a417527f779
 2014-05-09 17:32:38 -07:00
Winson Chung
c8bdba25cf am d3555c81: Merge "Adding dismiss method on the top cards, and disabling the app info pane." 
* commit 'd3555c81c8f9ef95089915c291b80696b55417d1':
  Adding dismiss method on the top cards, and disabling the app info pane.
 2014-05-10 00:28:00 +00:00
Winson Chung
6be810570f Merge "Adding dismiss method on the top cards, and disabling the app info pane." 2014-05-10 00:24:27 +00:00
Winson Chung
54e297a5bb Adding dismiss method on the top cards, and disabling the app info pane. 2014-05-09 17:15:32 -07:00
Robert Ly
37cb8d7530 docs: fix some notification code for wear stacks 
Change-Id: Iea6b444480b161ab08a9ba02dbabb22773862cf0
 2014-05-09 17:01:21 -07:00
Chris Craik
817e60f580 am 22e2eca6: Merge "Simplify projection matrix management." 
* commit '22e2eca672458409233ddb96ac81f4edbeb6a0b3':
  Simplify projection matrix management.
 2014-05-10 00:00:03 +00:00
Chris Craik
2417f7e08c Merge "Simplify projection matrix management." 2014-05-09 23:55:25 +00:00
Winson Chung
7a5556d047 am 5b1a0a46: Merge "Fixing crash in Activity.onApplyTheme()." 
* commit '5b1a0a46a125d1e2f4c469a964feac5321f6e933':
  Fixing crash in Activity.onApplyTheme().
 2014-05-09 23:47:25 +00:00
Winson Chung
77dd7ce506 Merge "Fixing crash in Activity.onApplyTheme()." 2014-05-09 23:42:49 +00:00
Winson Chung
4d1a434cbd Fixing crash in Activity.onApplyTheme(). 2014-05-09 16:42:00 -07:00
Winson Chung
0b20f57caf am ed517771: Merge changes I5d21645b,I8928e357 
* commit 'ed517771f4b6a6e59f49dee56ae21e7b95c6fa99':
  Fixing NPE in accessing theme attribute.
  Better transition between excluded-from-recent applications to recents.
 2014-05-09 23:32:40 +00:00
Winson Chung
b7a6e198fe Merge changes I5d21645b,I8928e357 
* changes:
  Fixing NPE in accessing theme attribute.
  Better transition between excluded-from-recent applications to recents.
 2014-05-09 23:25:58 +00:00
John Reck
e7bbfa53a6 am 2d3af881: Merge "Refactor VirtualLightRefBase & JNI" 
* commit '2d3af881e9d38b418c1037e9e8e07dbd8580f990':
  Refactor VirtualLightRefBase & JNI
 2014-05-09 23:25:04 +00:00
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