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

163505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
972a40e9ea am 27d8656c: am a2f07a88: add info about device owner app to the workplace highlights automerge: b5eadbe 
automerge: 57d60ee

* commit '57d60ee96f57908bdda94111aa89aeae9e3d1772':
  add info about device owner app to the workplace highlights
 2014-10-19 08:07:57 +00:00
smain@google.com
57d60ee96f am 27d8656c: am a2f07a88: add info about device owner app to the workplace highlights 
automerge: b5eadbe

* commit 'b5eadbe690afcf4dee3ee8c390cbfd23644799ca':
  add info about device owner app to the workplace highlights
 2014-10-19 07:54:42 +00:00
smain@google.com
b5eadbe690 am 27d8656c: am a2f07a88: add info about device owner app to the workplace highlights 
* commit '27d8656c16f62e58625a4b861df512d18c6931e5':
  add info about device owner app to the workplace highlights
 2014-10-19 07:40:01 +00:00
smain@google.com
27d8656c16 am a2f07a88: add info about device owner app to the workplace highlights 
* commit 'a2f07a88aa92d60b28295e84f440dbb4025d3eeb':
  add info about device owner app to the workplace highlights
 2014-10-19 02:42:00 +00:00
smain@google.com
a2f07a88aa add info about device owner app to the workplace highlights 
Change-Id: Ib1c5809e0d9e923fd71f4b33b1ef44091f1f3df4
 2014-10-18 18:20:20 -07:00
smain@google.com
13663811ab am 535e03e6: am 6ff0ce23: am fb604203: am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 
* commit '535e03e64612c5c861ab4ac269b174145cffe91b':
  add glare effect to screenshot and add 1x version with srcset
 2014-10-19 00:21:45 +00:00
smain@google.com
535e03e646 am 6ff0ce23: am fb604203: am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 
* commit '6ff0ce2338100cd155cf6fd64545f8852b517983':
  add glare effect to screenshot and add 1x version with srcset
 2014-10-19 00:17:18 +00:00
smain@google.com
6ff0ce2338 am fb604203: am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 
* commit 'fb604203d2b14d6a757810397b7c6897136fb2be':
  add glare effect to screenshot and add 1x version with srcset
 2014-10-19 00:13:40 +00:00
smain@google.com
fb604203d2 am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 
* commit 'f3e585ab20be006c8d5f3a033f9ade8a9dc6b55f':
  add glare effect to screenshot and add 1x version with srcset
 2014-10-19 00:08:50 +00:00
smain@google.com
f3e585ab20 Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 2014-10-19 00:04:54 +00:00
smain@google.com
02f9a5d4d7 add glare effect to screenshot and add 1x version with srcset 
Change-Id: I28ccd7bf509a65859b81e4fed8c63fbe62dad0b4
 2014-10-18 16:44:06 -07:00
smain@google.com
23f4f6955c am f6bb05a3: am 37e51105: am e91b7b11: am 9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there. 
* commit 'f6bb05a3c7d4a9fc477398ed940ed2bced1301c4':
  add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
 2014-10-18 23:32:56 +00:00
smain@google.com
f6bb05a3c7 am 37e51105: am e91b7b11: am 9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there. 
* commit '37e5110577b42d5e85175608ecff2bddf596dacc':
  add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
 2014-10-18 23:28:41 +00:00
smain@google.com
37e5110577 am e91b7b11: am 9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there. 
* commit 'e91b7b11acf70006c964f8f8d89967a90591df67':
  add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
 2014-10-18 23:24:17 +00:00
smain@google.com
e91b7b11ac am 9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there. 
* commit '9e9d5a369fb00730d58220eaa79082e351cf8bcd':
  add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
 2014-10-18 23:19:40 +00:00
smain@google.com
9e9d5a369f add info about workspaces to the lollipop highlights 
also move the workplace launcher image from the API Overview to
the highlights... and also just remove all images from the Overview
for simplicity there.

Change-Id: I36cc6d58efa6c5c912971b8636fde064b0f26797
 2014-10-18 16:14:42 -07:00
Elliott Hughes
870367567a am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
  Revert "Replacing FloatMath native implementation with calls to Math"
 2014-10-18 20:54:05 +00:00
Elliott Hughes
84e6d466ed am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 
* commit '4cd671e4d27befdd576fa86051956c3cafad6808':
  Revert "Replacing FloatMath native implementation with calls to Math"
 2014-10-18 20:48:03 +00:00
Elliott Hughes
4cd671e4d2 Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 2014-10-18 20:43:07 +00:00
Elliott Hughes
b3b68d0333 Revert "Replacing FloatMath native implementation with calls to Math" 
This reverts commit 32b88b48daa7383880088246d7222dd93cf55285.

Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
 2014-10-18 20:41:27 +00:00
Prem Kumar
b87c927456 am 2f87ebcd: am cffccb30: am 3f12569d: am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 
* commit '2f87ebcdef96dec37ed22433cbec518e6f5afa21':
  set autojoin associated scan frequency to 20 seconds
 2014-10-18 20:12:33 +00:00
Prem Kumar
2f87ebcdef am cffccb30: am 3f12569d: am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 
* commit 'cffccb304f969c531d373dc5aea6c96ef4c3ff38':
  set autojoin associated scan frequency to 20 seconds
 2014-10-18 20:07:49 +00:00
Prem Kumar
cffccb304f am 3f12569d: am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 
* commit '3f12569dff185ad5a3ec51d8bd9953ad13a6b534':
  set autojoin associated scan frequency to 20 seconds
 2014-10-18 20:01:50 +00:00
Prem Kumar
3f12569dff am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 
* commit '7666c912b820e61c58b57ad691b4b3babca9fbf9':
  set autojoin associated scan frequency to 20 seconds
 2014-10-18 19:56:03 +00:00
Prem Kumar
7666c912b8 Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 2014-10-18 19:51:53 +00:00
Dianne Hackborn
019de15ca2 am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 
* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
  Fix issue #17948288: Improve accuracy of memory use reporting
 2014-10-18 00:52:07 +00:00
Dianne Hackborn
2ea2bf2840 am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 
* commit 'ed512c817c090e2545db89e13837481f86e7596e':
  Fix issue #17948288: Improve accuracy of memory use reporting
 2014-10-18 00:46:51 +00:00
Alan Viverette
15b6be2d16 am c97924f4: am a496ba55: am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit 'c97924f49365e61f409071ad23bc0b920ebdf2b3':
  Translate compound button drawable by scroll position
 2014-10-18 00:44:08 +00:00
Dianne Hackborn
ed512c817c Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 2014-10-18 00:42:24 +00:00
Alan Viverette
c97924f493 am a496ba55: am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit 'a496ba555292f091e4051ef7f0bc946a894b2804':
  Translate compound button drawable by scroll position
 2014-10-18 00:36:44 +00:00
Alan Viverette
a496ba5552 am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit 'e61519b4a541a4262389842ae8b72dac401b2199':
  Translate compound button drawable by scroll position
 2014-10-18 00:32:17 +00:00
Alan Viverette
e61519b4a5 am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
  Translate compound button drawable by scroll position
 2014-10-18 00:26:21 +00:00
Andrew Lee
b29d96d634 am 761abc04: am 1557a226: Merge "Add functions to update on conference changes." into lmp-mr1-dev 
* commit '761abc04df0833a58537b7d40f7834aa51f06b32':
  Add functions to update on conference changes.
 2014-10-18 00:25:20 +00:00
Andrew Lee
761abc04df am 1557a226: Merge "Add functions to update on conference changes." into lmp-mr1-dev 
* commit '1557a226a74c6996b9cd6ac5ba6604c82af2336d':
  Add functions to update on conference changes.
 2014-10-18 00:21:11 +00:00
Alan Viverette
15e7b2ac60 Merge "Translate compound button drawable by scroll position" into lmp-dev 2014-10-18 00:20:27 +00:00
Alan Viverette
b95c336d78 Translate compound button drawable by scroll position 
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
 2014-10-17 17:19:12 -07:00
Andrew Lee
1557a226a7 Merge "Add functions to update on conference changes." into lmp-mr1-dev 2014-10-18 00:15:36 +00:00
Kristian Monsen
a64eb6ecf0 am f08b7ce9: am f247b908: am 4183a2fc: am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 
* commit 'f08b7ce9e9888fc77bfe8d4af70500a7530aedcb':
  Let TYPE_ANNOUNCEMENT be sent from any window
 2014-10-18 00:13:01 +00:00
Jim Miller
8596960eb5 am 956e424d: am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit '956e424d007df454cc4a2bfc576336eb0c8f20e4':
  Add utility methods to LockPatternUtils for encryption
 2014-10-18 00:07:35 +00:00
Kristian Monsen
f08b7ce9e9 am f247b908: am 4183a2fc: am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 
* commit 'f247b908640b7cfa14c13fed7aec875e8d5dc399':
  Let TYPE_ANNOUNCEMENT be sent from any window
 2014-10-18 00:07:17 +00:00
Kristian Monsen
f247b90864 am 4183a2fc: am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 
* commit '4183a2fc83369996499dfffcfb4113cb6b506165':
  Let TYPE_ANNOUNCEMENT be sent from any window
 2014-10-18 00:03:06 +00:00
Jim Miller
956e424d00 am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'd9b81b11b9c3c61d21565d7c6ac250fba1a4f052':
  Add utility methods to LockPatternUtils for encryption
 2014-10-18 00:03:06 +00:00
Jim Miller
d9b81b11b9 am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:57:33 +00:00
Kristian Monsen
4183a2fc83 am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 
* commit '5d6041813283086c5a290ad6ca07e05b1a6ffc14':
  Let TYPE_ANNOUNCEMENT be sent from any window
 2014-10-17 23:57:18 +00:00
Kristian Monsen
5d60418132 Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 2014-10-17 23:54:01 +00:00
Jim Miller
a054a8280c am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
  Add utility methods to LockPatternUtils for encryption
 2014-10-17 23:52:41 +00:00
Jim Miller
c6c843fbe8 Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev 2014-10-17 23:48:21 +00:00
Yorke Lee
76e3689b45 am 438723e6: am a801d349: am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev 
* commit '438723e6a8484ed4edd26494d389ef211febf85a':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
 2014-10-17 23:35:38 +00:00
Yorke Lee
438723e6a8 am a801d349: am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev 
* commit 'a801d34911bfb0a1e662fdf124d7c02fb4ffaf27':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
 2014-10-17 23:30:55 +00:00
Yorke Lee
a801d34911 am 9621b793: am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev 
* commit '9621b79396303037a86eb2639035b12080c858bf':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
 2014-10-17 23:24:53 +00:00