Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,685 Commits 3 Branches 0 Tags
89b4c11fac06a7e681c3f428891fd56465efd342
Commit Graph

47677 Commits

Author SHA1 Message Date
Prerepa Viswanadham
5af99614f2 Merge "Make onlost/onfound APIs public" 2015-05-06 01:15:00 +00:00
John Spurlock
f733ac5bf0 am 08e1fc30: am aca04f6a: am bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev 
* commit '08e1fc30cb0d9c37a9b1bae70a8b051ae9ac2948':
  Zen: Maintain source filters for both calls and messages.
 2015-05-06 01:05:44 +00:00
Prerepa Viswanadham
d3df86e5f0 Make onlost/onfound APIs public 
Change-Id: I455124478d953d652f216f71d5813782fc9633ab
 2015-05-05 17:56:38 -07:00
Selim Cinek
b9040caa63 am 1762af03: am e948bfeb: am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev 
* commit '1762af0307930942cfec3b2ad6dd7f6a8663b2b6':
  The voice assist may now be launched above the lockscreen
 2015-05-06 00:45:09 +00:00
John Spurlock
bc1a2ad878 Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev 2015-05-06 00:30:26 +00:00
Selim Cinek
6329bbceeb Merge "The voice assist may now be launched above the lockscreen" into mnc-dev 2015-05-05 23:52:35 +00:00
John Spurlock
a492d1d88c Zen: Maintain source filters for both calls and messages. 
Bug: 18635172
Change-Id: Ifeb56f1c8d8a30c4966c628edf7512199f3edb22
 2015-05-05 18:45:42 -04:00
Cheuksan Wang
f657b9969d add a parameter to carrier messaging calls to request delivery status 
In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:

onSendMultipartTextSms
onSendTextSms
onSendDataSms

Backward compatibility is maintained in
CarrierMessagingService.java. Third-party carrier apps implementing
the old API will continue to work.

BUG: 20224743
Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932
 2015-05-05 15:24:18 -07:00
Chris Craik
629f9c715c am 8fffd604: am 217ade77: am 356b1777: Merge "Cleanup properties" into mnc-dev 
* commit '8fffd6045d0eb27fbd6e894f6eee9818cda973bc':
  Cleanup properties
 2015-05-05 22:03:13 +00:00
Selim Cinek
e70d653523 The voice assist may now be launched above the lockscreen 
A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.

Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
 2015-05-05 14:52:52 -07:00
Chris Craik
356b177709 Merge "Cleanup properties" into mnc-dev 2015-05-05 21:30:08 +00:00
Jorim Jaggi
9a284f53f7 am 4eca7067: am 3bf26f1d: am 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev 
* commit '4eca70673174c684de4a337d738660b6c1988dfc':
  Only enable fingerprint auth after first regular auth
 2015-05-05 21:11:57 +00:00
Jorim Jaggi
5be4d295c0 Merge "Only enable fingerprint auth after first regular auth" into mnc-dev 2015-05-05 20:51:18 +00:00
Raph Levien
9985ca8788 am 37360dd4: am 8d736c1c: am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev 
* commit '37360dd4c770c5c0bfa61a5992c98d7461402fc6':
  Fix NPE in Html.inParagraph()
 2015-05-05 19:24:09 +00:00
Julia Reynolds
af491c6b24 am ac032058: am 16d4d46a: am 9e540a51: Merge "Fixing docs." into mnc-dev 
* commit 'ac032058c54d456011c154df4e465b955c7f7706':
  Fixing docs.
 2015-05-05 19:24:04 +00:00
Alan Viverette
aacb91d57d am 0de8c44a: am 4a207c4f: am 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev 
* commit '0de8c44a7497d79f9e21a4713061c0e74bd5ccae':
  Add API for obtaining changing configurations bitmask from Theme
 2015-05-05 19:23:43 +00:00
Todd Kennedy
19cc03a178 am 170f0406: am 2e22cec8: am 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev 
* commit '170f0406021e7ef2d9a9735506171e2dc6e4720d':
  Call Activity#onAttachFragment()
 2015-05-05 19:23:31 +00:00
Svet Ganov
b0a09de819 am 4e2029c0: am 2514a265: am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev 
* commit '4e2029c058966f30a71b1bcea16aa65a5d7f85c4':
  Permission UI - legacy apps support
 2015-05-05 19:23:20 +00:00
John Spurlock
fba7c4eadc am aac2806e: am 0c9c89a1: am 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev 
* commit 'aac2806e085eda5e91c0c5d1ea67de889314f2f0':
  Zen: Remove calendar rule attendance attribute.
 2015-05-05 19:23:09 +00:00
Jorim Jaggi
237b061182 Only enable fingerprint auth after first regular auth 
- Add method hasUserAuthenticatedSinceBoot to TrustManagerService
- Use this information to only enable fingerprint auth after the user
has at least once authenticated with his regular authentication
method.

Change-Id: Icf073ac3b340d557b044f6bf27f1a7f8511048e2
 2015-05-05 11:43:42 -07:00
Raph Levien
be8db11972 Merge "Fix NPE in Html.inParagraph()" into mnc-dev 2015-05-05 17:43:30 +00:00
Chris Craik
2507c34d91 Cleanup properties 
bug:19967854

Separate properties from Caches, into static, RenderThread-only class.

Also rewrites the means for java to set properties to correctly handle
threading, and adds an override for profile bars so that SysUi doesn't clutter
the screen with them.

Change-Id: I6e21a96065f52b9ecc49d1a126244804ba106fa9
 2015-05-05 10:36:09 -07:00
Julia Reynolds
2f46d949e2 Fixing docs. 
Bug: 20823970
Bug: 20820224
Change-Id: If6b5c43ae5cf88bd5a09adc60c1204ba9e6ab459
 2015-05-05 13:19:52 -04:00
Raph Levien
8e71a397c6 Fix NPE in Html.inParagraph() 
The typeface in a TypefaceSpan can be the null string. This patch
fixes the string comparison to not throw a NullPointerException.

Bug: 20849738
Change-Id: Ied049305794966bcbca00cfd11fe97a91b685d79
 2015-05-05 10:13:54 -07:00
Alan Viverette
261208e002 Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev 2015-05-05 16:50:29 +00:00
Alan Viverette
c1d527926e Add API for obtaining changing configurations bitmask from Theme 
Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.

Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
 2015-05-05 09:49:03 -07:00
Todd Kennedy
3266f60ba0 Merge "Call Activity#onAttachFragment()" into mnc-dev 2015-05-05 15:53:29 +00:00
Svet Ganov
4a64b19f23 Merge "Permission UI - legacy apps support" into mnc-dev 2015-05-05 15:34:10 +00:00
Svet Ganov
019d230499 Permission UI - legacy apps support 
Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
 2015-05-05 08:33:04 -07:00
John Spurlock
0bc8afff7e Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev 2015-05-05 14:42:03 +00:00
Niels Egberts
100860736e Merge "Don't strip country and variant from locale." 2015-05-05 13:54:13 +00:00
John Spurlock
d39af2d3f8 Zen: Remove calendar rule attendance attribute. 
- No longer supporting a filter based on attendance type.
 - Remove from model + condition provider logic.

Bug: 20064962
Change-Id: I0bc16275a2860ab95d4de316b6326a1499003f05
 2015-05-05 09:49:32 -04:00
Tingting Wang
830e158d99 Merge "Add metadata_dirty column to ContactsContract." 2015-05-05 01:41:54 +00:00
Andre Eisenbach
0b9c3610b0 am 112f177c: am 7e66f6f4: am ab258139: BluetoothSap class should not be public 
* commit '112f177c2587fc3ba36bba0f5a7a7dcbb131ef13':
  BluetoothSap class should not be public
 2015-05-05 01:37:36 +00:00
George Mount
1418da5365 am fa8cd17a: am c441dca2: am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev 
* commit 'fa8cd17a4064f8293b4bbae379769d6e63e0ac4b':
  Fix potential NPE in internal isValidTarget method.
 2015-05-05 01:36:57 +00:00
Andre Eisenbach
5e60b79e39 am 123bbd5a: am 621b790d: am f455986a: Add documentation for BluetoothSocket.getConnectionType() 
* commit '123bbd5aef25d42bf3bf1ea84ccd8d0c08229363':
  Add documentation for BluetoothSocket.getConnectionType()
 2015-05-05 01:36:50 +00:00
George Mount
3a272fec3d am c1d945c6: am 9066d6d7: am c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev 
* commit 'c1d945c65851a39be3f2beae0474de589ee63faa':
  When returning, transition only existing shared elements.
 2015-05-05 01:36:44 +00:00
George Mount
f96481910a am ae49eae1: am c76d048f: am 61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev 
* commit 'ae49eae1d3f0ce9cace3066e092300de45b3fec1':
  Fix Visibility not changing until Animator ends.
 2015-05-05 01:36:27 +00:00
Alan Viverette
21d7cb6f26 am dc49a8bb: am d0dfb237: am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev 
* commit 'dc49a8bb23e765525f1bc752a417cb43cba19dbf':
  Always force constructors accessible during inflation
 2015-05-05 01:36:10 +00:00
Jeff Sharkey
74d3849d51 am 2d73a5a4: am 2a9f87cf: am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev 
* commit '2d73a5a46c44cc39ffbca615ea87afb3ae647c8a':
  Avoid NPE when fsUuid is null.
 2015-05-05 01:35:59 +00:00
Andre Eisenbach
112f177c25 am 7e66f6f4: am ab258139: BluetoothSap class should not be public 
* commit '7e66f6f4b7992e001b3d5c226f043539b99b7bff':
  BluetoothSap class should not be public
 2015-05-05 01:23:21 +00:00
George Mount
fa8cd17a40 am c441dca2: am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev 
* commit 'c441dca2e96aa5353442b4ace33184f88e671e33':
  Fix potential NPE in internal isValidTarget method.
 2015-05-05 01:22:48 +00:00
Andre Eisenbach
123bbd5aef am 621b790d: am f455986a: Add documentation for BluetoothSocket.getConnectionType() 
* commit '621b790dc8c3b45f343e44d5e673368a0ceef57a':
  Add documentation for BluetoothSocket.getConnectionType()
 2015-05-05 01:22:43 +00:00
George Mount
c1d945c658 am 9066d6d7: am c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev 
* commit '9066d6d7b6275f2fd46078c0034493b7da399631':
  When returning, transition only existing shared elements.
 2015-05-05 01:22:38 +00:00
George Mount
ae49eae1d3 am c76d048f: am 61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev 
* commit 'c76d048f7166dccbba25757f31db62fae8aabe2a':
  Fix Visibility not changing until Animator ends.
 2015-05-05 01:22:22 +00:00
Alan Viverette
dc49a8bb23 am d0dfb237: am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev 
* commit 'd0dfb237142284e4a6e62337d2610e2b4dd9d8e2':
  Always force constructors accessible during inflation
 2015-05-05 01:22:01 +00:00
Jeff Sharkey
2d73a5a46c am 2a9f87cf: am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev 
* commit '2a9f87cfdf440ed6cfe92ab3428ca8d193586a2f':
  Avoid NPE when fsUuid is null.
 2015-05-05 01:21:50 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Tingting Wang
03583a4ee3 Add metadata_dirty column to ContactsContract. 
Add metadata_dirty column to RawContacts table, to indicate
metadata related info has been changed.

BUG 20827851

Change-Id: I45ba90bb44f1d3e66b45facd9a643fc77e876e8a
 2015-05-04 16:34:58 -07:00
Andre Eisenbach
ab2581398c BluetoothSap class should not be public 
Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67
 2015-05-04 23:20:28 +00:00