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

153530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vandwalle
eaa1772cbe am a88c6914: (-s ours) am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev 
* commit 'a88c6914718127278c23626e05454ff2cfaba3fd':
  fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
 2014-08-27 17:05:37 +00:00
Raph Levien
2ea962cf20 Merge "Remove duplicate line breaking" 2014-08-27 16:29:56 +00:00
Raph Levien
b8082603b6 Remove duplicate line breaking 
Fix for bug 17297223 "minikin crashing after boot on hammerhead in
master"

Due to improperly merged code, the line breaker was being run twice,
causing two copies of the layout. That in turn caused text crashes
because the line ends are not monotonic.

Change-Id: Ieaa702c530d6e9b2a90fb52a4ad716a9ddb567e7
 2014-08-27 09:22:27 -07:00
Baligh Uddin
085511a284 Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:20 +00:00
Baligh Uddin
1237584983 Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:11 +00:00
Baligh Uddin
28bb0aae3b Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:01 +00:00
Baligh Uddin
30b785b566 Merge "Import translations. DO NOT MERGE" 2014-08-27 15:59:56 +00:00
vandwalle
8c1f0b3faf am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev 
* commit 'f7c9ffc381b4f8001caacfdd82386f0b060e4dd1':
  fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
 2014-08-27 14:11:21 +00:00
Jorim Jaggi
36ada7c799 am 930bc907: am fc5665d1: am bb45000d: Merge "Content description for clear all notifications" into lmp-dev 
* commit '930bc9078645189323331dcf37b3056a55de8e09':
  Content description for clear all notifications
 2014-08-27 14:11:20 +00:00
vandwalle
567943bdcf am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev 
* commit '4c5d4e29e317167947392a5b6280fcb6f2d68b85':
  fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
 2014-08-27 14:03:24 +00:00
Jorim Jaggi
a99a47b004 am fc5665d1: am bb45000d: Merge "Content description for clear all notifications" into lmp-dev 
* commit 'fc5665d1886504e837a2f03978a52b2252c4861f':
  Content description for clear all notifications
 2014-08-27 14:01:33 +00:00
Calin Juravle
241e6d3fed am 140663fd: am 5aede5a2: (-s ours) am 9b5112c3: Merge "Make native bridge property read-only." 
* commit '140663fd3d7e0cc1548fb78ce01dacf6d70ee75d':
  Make native bridge property read-only.
 2014-08-27 13:57:17 +00:00
Jorim Jaggi
0275e5b037 am bb45000d: Merge "Content description for clear all notifications" into lmp-dev 
* commit 'bb45000db1217466c18114a067a74741d068ebad':
  Content description for clear all notifications
 2014-08-27 13:54:18 +00:00
vandwalle
58ecda5915 Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev 2014-08-27 13:51:59 +00:00
Calin Juravle
af8f2d3351 am 5aede5a2: (-s ours) am 9b5112c3: Merge "Make native bridge property read-only." 
* commit '5aede5a226b181f602b208c99a4a10b959e967fd':
  Make native bridge property read-only.
 2014-08-27 13:48:54 +00:00
Jorim Jaggi
394ea9eafa Merge "Content description for clear all notifications" into lmp-dev 2014-08-27 13:43:11 +00:00
Jorim Jaggi
ca3b1af1e3 Content description for clear all notifications 
Bug: 17258095
Change-Id: Iafd92f9c1f0bb14ebf53a30b888f144866582925
 2014-08-27 15:42:44 +02:00
Calin Juravle
0fcd10fc2a am d911a3bd: am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev 
* commit 'd911a3bd0f95721e0fcf26f61cfa517bbee359b9':
  Update the handling of the native bridge property.
 2014-08-27 13:37:41 +00:00
Calin Juravle
f924c027d3 am 0a63f754: am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev 
* commit '0a63f754e6f192539be16f59bda3839aa5d24641':
  Update the handling of the native bridge property.
 2014-08-27 13:27:49 +00:00
Calin Juravle
5aede5a226 am 9b5112c3: Merge "Make native bridge property read-only." 
* commit '9b5112c36b5163925cb303c0cd016bf4115c5800':
  Make native bridge property read-only.
 2014-08-27 13:27:21 +00:00
Calin Juravle
9b5112c36b Merge "Make native bridge property read-only." 2014-08-27 13:19:20 +00:00
Calin Juravle
fca1ef2c29 am 729fc678: Merge "Update the handling of the native bridge property." into lmp-dev 
* commit '729fc678bec8d45b120a5c7fc1657952333f4d79':
  Update the handling of the native bridge property.
 2014-08-27 13:18:32 +00:00
Selim Cinek
e4c57cd770 am 76bd889a: am a139ca24: am fb24635e: Made quick settings RTL compatible. 
* commit '76bd889a6c0de6bc48115d70db048add39b27772':
  Made quick settings RTL compatible.
 2014-08-27 13:13:03 +00:00
Selim Cinek
58455c5e09 am 09b5f22d: am 20a161d2: am 73375a57: Added anti-falsing logic to the keyguard. 
* commit '09b5f22df871e2036179b66c4e3e74208eceaeca':
  Added anti-falsing logic to the keyguard.
 2014-08-27 13:12:57 +00:00
Calin Juravle
6deb439d03 Merge "Update the handling of the native bridge property." into lmp-dev 2014-08-27 13:09:27 +00:00
Selim Cinek
58a3536e60 am a139ca24: am fb24635e: Made quick settings RTL compatible. 
* commit 'a139ca246353cc450654b00c779744706b65111f':
  Made quick settings RTL compatible.
 2014-08-27 13:02:48 +00:00
Selim Cinek
cb7d17031c am 20a161d2: am 73375a57: Added anti-falsing logic to the keyguard. 
* commit '20a161d2b2a6db12e9366ecc1105938a25920d34':
  Added anti-falsing logic to the keyguard.
 2014-08-27 13:02:43 +00:00
Selim Cinek
a133fa3a93 am fb24635e: Made quick settings RTL compatible. 
* commit 'fb24635eeab138667e4394541ae89b0fa71e31cd':
  Made quick settings RTL compatible.
 2014-08-27 12:52:10 +00:00
Selim Cinek
5fad8b3fa2 am 73375a57: Added anti-falsing logic to the keyguard. 
* commit '73375a57cb9f3b89a3222ab1eca4796158ad5ea6':
  Added anti-falsing logic to the keyguard.
 2014-08-27 12:52:02 +00:00
Torne (Richard Coles)
46a807f4eb Also allow + in stringToFloat. 
Some resource files also use a + prefix; allow that as well as -.

Change-Id: I79cf13841849633f8fa49ee7e23698079d890489
 2014-08-27 12:36:44 +01:00
Torne (Richard Coles)
463a7c3add Fix stringToFloat test to allow '-'. 
Check was incorrectly disallowing negative values; allow '-' as the
first character.

Change-Id: I6002c38b4a5141c3ab3e385c4e5fc8c55d285f82
 2014-08-27 11:57:50 +01:00
Selim Cinek
06d3bca095 Made quick settings RTL compatible. 
The layout is now mirrored correctly and the icons as well.

Bug: 15284805
Change-Id: I3d6fadad0a987adb49f826d4189f9dd58e20d326
 2014-08-27 12:38:15 +02:00
Selim Cinek
19c8c708f1 Added anti-falsing logic to the keyguard. 
Newly enforcing a threshold for the following cases:
Unlocking, Dismissing Notifications, Swiping Down Quick settings.
Also increased the affordance threshold slightly.

Bug: 15433087
Change-Id: I723346dedf9ae0e3f8b103182992ab572fc394b9
 2014-08-27 12:38:15 +02:00
Jungshik Jang
2df55899a3 am aa587352: am d2560b28: am 035edcdf: Allow broadcast for <Set System Audio Mode>. 
* commit 'aa5873521ae4a7c38aa4fcab9ebd98e4ec32c37e':
  Allow broadcast for <Set System Audio Mode>.
 2014-08-27 10:01:32 +00:00
Jungshik Jang
81cd65b8b4 am a30e6514: am 927f0b65: am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev 
* commit 'a30e6514c88c501590c92e19c5cd9447fb2ba8e8':
  Add more debug message to HdmiControlService
 2014-08-27 09:48:26 +00:00
Russell Brenner
b95cef8ac0 am c9c663d3: am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c9c663d31884f85bbe14a1505051836288b517fb':
  Print services setting changes not handled for managed profiles.
 2014-08-27 09:48:19 +00:00
Andrew Solovay
cd11db92f7 am c499dff9: am a4d8d6eb: am 29f4975e: am 3442b412: am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs 
* commit 'c499dff90d0cfdaa0a552e091cf20af1615ab845':
  docs: Fixed error in code sample.
 2014-08-27 09:48:13 +00:00
Tim Murray
38ff8ad9ed am 9b1846ec: am 2d8cfe60: am 7b0bf2fc: am 29d35997: am cb16b55b: am 2a866f07: Update RenderScript docs. 
* commit '9b1846ec3b78b53e81a7facc33f7bcde33e9eb58':
  Update RenderScript docs.
 2014-08-27 09:48:08 +00:00
Dianne Hackborn
b1d1fd0e06 am 7e6e7230: am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr 
* commit '7e6e7230ebbc7085c2e0bb84741f5f1df0fc45e2':
  Fix issue #17146552: system anr
 2014-08-27 09:47:50 +00:00
Jungshik Jang
493ecb1dcd am d2560b28: am 035edcdf: Allow broadcast for <Set System Audio Mode>. 
* commit 'd2560b289b4a18f7a4b8aeabb0a30d298a6b21d9':
  Allow broadcast for <Set System Audio Mode>.
 2014-08-27 09:22:47 +00:00
Jungshik Jang
4d804afc8e am 035edcdf: Allow broadcast for <Set System Audio Mode>. 
* commit '035edcdf62d67badd7b9bd6e7fd44bffc790fcca':
  Allow broadcast for <Set System Audio Mode>.
 2014-08-27 09:10:36 +00:00
Dianne Hackborn
14efe16be5 am e6495bb0: am bad701ee: am 61b7055e: Merge "Fix issue #17179314: Make recents limits consistent" into lmp-dev 
* commit 'e6495bb01be4af93f60dff947b66a8ef474ac2af':
  Fix issue #17179314: Make recents limits consistent
 2014-08-27 09:03:49 +00:00
vandwalle
b1dce0220b fix ScanResult read from parcel, this function was broken and causes wifi settings to crash 
Bug: 17293156

Change-Id: I5f7a8141adb21103e98913c9802d8364164eaba7
 2014-08-27 08:16:31 +00:00
Jungshik Jang
473119fdc3 Allow broadcast for <Set System Audio Mode>. 
AVR may broadcst <Set System Audio Mode> to start system audio mode.
But we do handle direct message case.

Bug: 17292360
Change-Id: I9111f8122d58b31f3801e4e78f283db65e79330b
 2014-08-27 16:43:22 +09:00
Jungshik Jang
6421dfc9d1 am 927f0b65: am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev 
* commit '927f0b6594d4c806e830cb60684e88e41990e97d':
  Add more debug message to HdmiControlService
 2014-08-27 06:59:01 +00:00
Jungshik Jang
3e754f0b57 am 82918c93: Merge "Add more debug message to HdmiControlService" into lmp-dev 
* commit '82918c93948fd658f4ad6932ac529cec5ab59b7c':
  Add more debug message to HdmiControlService
 2014-08-27 06:50:22 +00:00
Jungshik Jang
038c8601c3 Merge "Add more debug message to HdmiControlService" into lmp-dev 2014-08-27 06:39:58 +00:00
Russell Brenner
ac7334d4fd am c04b259a: am d1d4a28a: Merge branch \'lmp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev 
* commit 'c04b259aa962616089994c8cf225ff396feb1c83':
  Print services setting changes not handled for managed profiles.
 2014-08-27 06:32:14 +00:00
Andrew Solovay
90ed24fafd am a4d8d6eb: am 29f4975e: am 3442b412: am 8d8cf0b2: am e7c7993e: Merge "docs: Fixed error in code sample." into klp-modular-docs 
* commit 'a4d8d6eb1ec3983948235631f0071a9d4ba739a0':
  docs: Fixed error in code sample.
 2014-08-27 06:32:09 +00:00
Tim Murray
6964733348 am 2d8cfe60: am 7b0bf2fc: am 29d35997: am cb16b55b: am 2a866f07: Update RenderScript docs. 
* commit '2d8cfe60cc7b59f3f10c154510d081029535d820':
  Update RenderScript docs.
 2014-08-27 06:32:04 +00:00