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

155552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Yorke Lee
9621b79396 am e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev 
* commit 'e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
  Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
 2014-10-17 23:19:31 +00:00
Yorke Lee
e4e3fcec41 Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev 2014-10-17 23:16:35 +00:00
Svetoslav
0b5af04a8b am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:09:55 +00:00
Jim Miller
dd5de719c5 Add utility methods to LockPatternUtils for encryption 
This enables a change in Settings that allows device
encryption to be disabled by the user.

Fixes bug 17881324

Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
 2014-10-17 16:08:21 -07:00
Svetoslav
ebb38bcc03 am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev 
* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.
 2014-10-17 23:04:12 +00:00
Adam Lesinski
effd416ee3 am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 
* commit '83fae208fee402d8a6a51362f99660f9a49bd5a4':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
 2014-10-17 23:01:44 +00:00
Svetoslav
cd2b54e6e5 Merge "Accessibility no longer overrides strong encryption." into lmp-dev 2014-10-17 22:59:22 +00:00
Adam Lesinski
83fae208fe am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 
* commit '3cd840f4b5a2988700a6b366fa32f4565c319900':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
 2014-10-17 22:56:10 +00:00
Adam Lesinski
3cd840f4b5 Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev 2014-10-17 22:50:50 +00:00
Dianne Hackborn
b3af4ec6ba Fix issue #17948288: Improve accuracy of memory use reporting 
We now use Mapped to not double-count cached pages that are
mapped in to app processes.  Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.

It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space.  I need to figure out
how I was finding that before.

Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
 2014-10-17 15:25:13 -07:00
William Bourke
44d515457a am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:09:19 +00:00
Joe Fernandez
f617da039d am 2cc44f2a: am 6dc5d683: docs: Android L release fixes 
* commit '2cc44f2adce51bbc7df4b96d12287628b8f903b3':
  docs: Android L release fixes
 2014-10-17 22:09:15 +00:00
William Bourke
7d5c68e31e am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 
* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility
 2014-10-17 22:03:50 +00:00
Joe Fernandez
2cc44f2adc am 6dc5d683: docs: Android L release fixes 
* commit '6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
  docs: Android L release fixes
 2014-10-17 22:03:47 +00:00
William Bourke
84b4791aaf Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev 2014-10-17 22:01:00 +00:00
Joe Fernandez
6dc5d68399 docs: Android L release fixes 
- L Highlights fixes
b/18029526
- L API Overview fixes
b/18034482

Change-Id: I2e93ece18748c15a8fe10749e75008bf5ed9a7c0
 2014-10-17 14:57:29 -07:00
William Bourke
33f577cfea Modified lollipop Easter egg for TV compatibility 
Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
 2014-10-17 21:57:23 +00:00
Joe Fernandez
1f5d55d135 am 1fede10c: am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 
* commit '1fede10c269f97f2a9dac48025dccce7e45cef9d':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
 2014-10-17 21:51:51 +00:00
Adam Lesinski
9306a474e1 AAPT: Fix an issue where a resource name was incorrectly derived on Windows 
Calling String8::getLeaf() will assume the system's file path separator,
however the source string was already converted to a unix path.
getLeaf() would therefore not find any occurence of '\' and would
return the full path.

Bug:18036805
Change-Id: Ic2bfac0cc553406740204a296327e266b05c0eff
 2014-10-17 21:46:52 +00:00
Joe Fernandez
1fede10c26 am 09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 
* commit '09cce6f509af58e3eeaf687b63e292c222a7d769':
  docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
 2014-10-17 21:46:10 +00:00
Joe Fernandez
09cce6f509 Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev 2014-10-17 21:39:27 +00:00
Svetoslav
a6711ff6f0 Accessibility no longer overrides strong encryption. 
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
 2014-10-17 14:33:11 -07:00
Kristian Monsen
ba3787d849 Let TYPE_ANNOUNCEMENT be sent from any window 
Part of fix for bug 17905712

Change-Id: I4e4b09f6b6342a27744e42984d483ef8de18fbff
 2014-10-17 14:13:07 -07:00
Andrew Solovay
1c56c15d4d docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result 
See first comment for doc staging directory.

bug: 18000631
Change-Id: I4dba47e0965947774adad86218369678311f4a0c
 2014-10-17 14:05:22 -07:00
Alan Viverette
177ec4608e Only request layout when removeView() actually removes a view 
BUG: 18035456
Change-Id: Iec82be63ef9fc4d0ff90d93f8f3a65328a5e1eba
 2014-10-17 13:34:50 -07:00
Joe Fernandez
9881c0d8f4 am c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit 'c97bc213481cef235b10a2d4d17caba7301cd3c5':
  docs: update location of sample apps
 2014-10-17 20:01:04 +00:00
Joe Fernandez
c97bc21348 am f21746fc: Merge "docs: update location of sample apps" into lmp-dev 
* commit 'f21746fca8603ed5a4d328b804ad6de24226ef49':
  docs: update location of sample apps
 2014-10-17 19:52:07 +00:00
Joe Fernandez
f21746fca8 Merge "docs: update location of sample apps" into lmp-dev 2014-10-17 19:39:28 +00:00
Adam Lesinski
12c84b5d9f Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev 2014-10-17 19:17:20 +00:00
Amith Yamasani
e1970346a4 am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
  Use the correct method to check if device is encrypted
 2014-10-17 19:05:25 +00:00
smain@google.com
43d7ad3e48 am e62a4a50: am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 
* commit 'e62a4a50cf2cc4c26f8616d09bed30e94a7699ca':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
 2014-10-17 19:05:21 +00:00
Amith Yamasani
b5afeca3d9 am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev 
* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
  Use the correct method to check if device is encrypted
 2014-10-17 19:00:36 +00:00
smain@google.com
e62a4a50cf am af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev 
* commit 'af8de90fd604d3a677947e72b0000bd1075c3665':
  fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
 2014-10-17 18:56:06 +00:00
Amith Yamasani
a865bb5df8 Merge "Use the correct method to check if device is encrypted" into lmp-dev 2014-10-17 18:55:58 +00:00