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

156835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
67b404d688 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:42 +00:00
Baligh Uddin
a4cbfb822e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:39 +00:00
Baligh Uddin
3b7e7817c5 Import translations. DO NOT MERGE 
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
 2014-10-19 13:18:18 -07:00
Baligh Uddin
5466403f16 am 475737db: (-s ours) am 425c06a0: (-s ours) am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '475737db01b1de3d164bd5f5c78e6304d98ac10b':
  Import translations. DO NOT MERGE
 2014-10-19 20:13:31 +00:00
Baligh Uddin
22eb2f942d am 02e47260: (-s ours) am 297013dd: (-s ours) am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '02e4726063ea6d6cece7e6c235a35fa0005c04f1':
  Import translations. DO NOT MERGE
 2014-10-19 20:13:26 +00:00
Baligh Uddin
f8a5042607 am df780624: (-s ours) am 4ceb3c04: (-s ours) am cfccba99: (-s ours) Import translations. DO NOT MERGE 
* commit 'df7806249f1827c0d2706aca400d9ce71eafa4b0':
  Import translations. DO NOT MERGE
 2014-10-19 20:13:21 +00:00
Baligh Uddin
475737db01 am 425c06a0: (-s ours) am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '425c06a0b08f7ef1de396cd4cf6bc490171cc2e7':
  Import translations. DO NOT MERGE
 2014-10-19 20:07:19 +00:00
Baligh Uddin
02e4726063 am 297013dd: (-s ours) am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '297013dd4cee3f27f1df73bde642d8636492954b':
  Import translations. DO NOT MERGE
 2014-10-19 20:07:16 +00:00
Baligh Uddin
df7806249f am 4ceb3c04: (-s ours) am cfccba99: (-s ours) Import translations. DO NOT MERGE 
* commit '4ceb3c0412985dfa8f517bee024fd7e978156394':
  Import translations. DO NOT MERGE
 2014-10-19 20:07:12 +00:00
Baligh Uddin
425c06a0b0 am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4199680a9da3fa01be65606e735deab3be089b23':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:36 +00:00
Baligh Uddin
297013dd4c am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:33 +00:00
Baligh Uddin
4ceb3c0412 am cfccba99: (-s ours) Import translations. DO NOT MERGE 
* commit 'cfccba99a234a5883300a7542ec12ddfec012ff3':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:29 +00:00
Baligh Uddin
b5c8ec76d7 Import translations. DO NOT MERGE 
Change-Id: I382cff15f6fd4e02e2781bbb2b51e7eb3897b6fc
Auto-generated-cl: translation import
 2014-10-19 12:55:23 -07:00
Baligh Uddin
4199680a9d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
7fda5c91e5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
cfccba99a2 Import translations. DO NOT MERGE 
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import
 2014-10-19 10:56:51 -07:00
Baligh Uddin
b18d26738d Import translations. DO NOT MERGE 
Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import
 2014-10-19 10:52:12 -07:00
Baligh Uddin
7d369a6d5b Import translations. DO NOT MERGE 
Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import
 2014-10-19 10:50:27 -07: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
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
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
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
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
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
Wei Wang
020bd7b861 Remove spammy log information for BLE scan. 
Bug:17574681
Change-Id: Ic5761ad7262200f38f2b67659c37f8a3f01d80d5
 2014-10-18 00:29:57 +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
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
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