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

202207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
ee895112b3 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 am: 78f672ef05 am: 8d85292827 
am: 212fe88251

* commit '212fe88251a6c769ba71f562fd2f51c30926ccc1':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:39:15 +00:00
Baligh Uddin
212fe88251 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 am: 78f672ef05 
am: 8d85292827

* commit '8d8529282719f035d0ce7460ffd640f94d6c6eb8':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:35:00 +00:00
Baligh Uddin
8d85292827 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 
am: 78f672ef05

* commit '78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:31:02 +00:00
Baligh Uddin
78f672ef05 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b 
am: aa2210c5c1

* commit 'aa2210c5c174fd681fd52fd43e55de6c018a93ad':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:26:49 +00:00
Baligh Uddin
a9850abb82 Fix plurals variable to unblock Translations Pipeline. am: 71921cb23c 
am: 6980f76931

* commit '6980f76931d3a52a2c071b10a5736afe8de0fdf4':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:26:48 +00:00
Baligh Uddin
aa2210c5c1 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 
am: 4340e0677b

* commit '4340e0677b691f2ab12549556c23b88e599cf8c1':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:22:23 +00:00
Baligh Uddin
4340e0677b Fix plurals variable to unblock Translations Pipeline. 
am: 61f9f31468

* commit '61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:18:11 +00:00
Baligh Uddin
6980f76931 Fix plurals variable to unblock Translations Pipeline. 
am: 71921cb23c

* commit '71921cb23c7493ae6c7186d5554233540c9bcc9c':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:18:10 +00:00
Baligh Uddin
71921cb23c Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
(cherry picked from commit 50d23adfe26bf0cf9a34138efc299eaec04127e9)

Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
 2016-01-06 18:55:26 +00:00
Baligh Uddin
61f9f31468 Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
(cherry picked from commit 50d23adfe26bf0cf9a34138efc299eaec04127e9)

Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
 2016-01-06 18:54:41 +00:00
Gus Prevas
1d3bac82b3 Merge "Defines task to front/back animations in styles_micro." into cw-e-dev 2015-12-29 15:09:26 +00:00
Gus Prevas
fcc57db731 Defines task to front/back animations in styles_micro. 
Bug: 26112737
Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
 2015-12-28 15:02:13 -05:00
Bryce Lee
9c27969385 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 2015-12-18 23:02:40 +00:00
Daniel Koulomzin
cbef517d02 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev 2015-12-18 19:49:18 +00:00
Bryce Lee
15309a3d20 Remove duplicate Bluetooth profiles. 
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
 2015-12-18 11:34:20 -08:00
Robert Greenwalt
f1530bf3d7 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 am: 1e04dfb926 
am: 3927089cce

* commit '3927089cce9d43a0b517f53fd6a542f07cb0955b':
  Protect some new broadcasts.
 2015-12-18 11:31:54 -08:00
Robert Greenwalt
3927089cce resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 am: 81674b1ff5 
am: 1e04dfb926

* commit '1e04dfb926040a6fad073fca0835777123d155e7':
  Protect some new broadcasts.
 2015-12-18 11:24:53 -08:00
Robert Greenwalt
1e04dfb926 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 am: 2ecc918bd3 
am: 81674b1ff5

* commit '81674b1ff5deedcf2f1a79f07441e506a4f66354':
  Protect some new broadcasts.
 2015-12-18 19:17:58 +00:00
Robert Greenwalt
81674b1ff5 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798 
am: 2ecc918bd3

* commit '2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
  Protect some new broadcasts.
 2015-12-18 19:04:25 +00:00
Robert Greenwalt
2ecc918bd3 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 
am: 5946a9b798

* commit '5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
  Protect some new broadcasts.
 2015-12-18 18:48:59 +00:00
Robert Greenwalt
5946a9b798 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
am: 5a77651489

* commit '5a77651489ace080671034a85e5771c6ddc73525':
  Protect some new broadcasts.
 2015-12-18 18:38:10 +00:00
Daniel Koulomzin
087ae471c2 Making ViewRootImpl drop input events when the Activity is in ambient 
mode.

WearableActivityController tells ViewRootImpl about ambient mode.

Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
 2015-12-18 12:56:00 -05:00
Robert Greenwalt
5a77651489 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
 2015-12-17 19:32:43 -08:00
Robert Greenwalt
a652b7161d Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe 
am: 628b8f1f5f

* commit '628b8f1f5f6d249e2f222602352d14c40d648d97':
  Check permissions on getDeviceId.
 2015-12-17 23:04:24 +00:00
Robert Greenwalt
064eb2a7cc Merge "Check permissions on getDeviceId." into mnc-dr-dev 
am: ef58df63d6

* commit 'ef58df63d6ba9d56620b6a440f15d0e07c842a44':
  Check permissions on getDeviceId.
 2015-12-17 23:01:33 +00:00
Robert Greenwalt
628b8f1f5f Merge "Check permissions on getDeviceId." into mnc-dev 
am: 4557ef32fe

* commit '4557ef32fe36b6f7ef7918052400d18af51d452f':
  Check permissions on getDeviceId.
 2015-12-17 22:58:14 +00:00
Robert Greenwalt
ef58df63d6 Merge "Check permissions on getDeviceId." into mnc-dr-dev 2015-12-17 22:52:58 +00:00
Robert Greenwalt
4557ef32fe Merge "Check permissions on getDeviceId." into mnc-dev 2015-12-17 22:52:56 +00:00
Bryce Lee
cf91b45c05 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev 2015-12-17 19:40:47 +00:00
Bryce Lee
cae2f2415b Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev 2015-12-17 00:02:41 +00:00
Bryce Lee
e457fa4b9d Add UUID to BluetoothHeadsetClientCall 
This will allow for unique identification of a call as id only provides
uniqueness per session.

Bug: 26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
 2015-12-16 15:33:59 -08:00
Adam Lesinski
8c9209183f DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 
am: 40d1ab91d2

* commit '40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
 2015-12-16 23:16:18 +00:00
Adam Lesinski
40d1ab91d2 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 
am: b2c5155638

* commit 'b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
  DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
 2015-12-16 23:09:27 +00:00
Adam Lesinski
b2c5155638 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.

This will also add implied features for that permission, marked as -sdk-23 features.

Ex:

uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'

feature-group: label=''
  uses-feature: name='android.hardware.location'
  uses-implied-feature: name='android.hardware.location' reason='...'
  uses-feature-sdk-23: name='android.hardware.camera'
  uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'

Bug:24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit 5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
 2015-12-16 22:43:07 +00:00
Bryce Lee
ec85f34812 Add setting for declaring disabled bluetooth profiles. 
Bug: 25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
 2015-12-16 13:32:28 -08:00
Geoff Mendal
d0dd157ade Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 05:05:18 +00:00
Geoff Mendal
8f316d2723 Import translations. DO NOT MERGE 
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
 2015-12-15 21:03:50 -08:00
Geoff Mendal
8b4b230174 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 05:02:26 +00:00
Geoff Mendal
1144462f6b Import translations. DO NOT MERGE 
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
 2015-12-15 21:00:49 -08:00
Geoff Mendal
10bc1c7000 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:49:00 +00:00
Geoff Mendal
e0b74266f7 Import translations. DO NOT MERGE 
Change-Id: Idc7e685457dc0bc2da4df2bd10ac2187d64fa00f
Auto-generated-cl: translation import
 2015-12-15 20:45:33 -08:00
Geoff Mendal
df5dd062a0 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:36:13 +00:00
Geoff Mendal
648fa53981 Import translations. DO NOT MERGE 
Change-Id: Ic3c47d16450ddb80c815369cf01bb63be1f73a88
Auto-generated-cl: translation import
 2015-12-15 20:34:53 -08:00
Geoff Mendal
531eb5b484 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:34:26 +00:00
Geoff Mendal
d2615bdf40 Import translations. DO NOT MERGE 
Change-Id: Ie93a6af2b483228b5797bdb018ac8accc7ef54ed
Auto-generated-cl: translation import
 2015-12-15 20:29:48 -08:00
Geoff Mendal
327d917865 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-12-16 04:26:04 +00:00
Geoff Mendal
695cf968b7 Import translations. DO NOT MERGE 
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
 2015-12-15 20:21:26 -08:00
Geoff Mendal
22dea4e16f Import translations. DO NOT MERGE 
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
 2015-12-15 20:18:32 -08:00
Bryce Lee
4614596a39 Allow access to deprecated LOCK_PATTERN_ENABLED flag. 
It is possible that older platforms may have not cleared the lock pattern,
but instead only checked this flag to determine the lock pattern enabled
state. In such cases, upgrading to a platform with that only checks the
lock pattern can lead to the lock screen being re-enabled by accident.
These new methods allow this condition to be identified and resolved.

Bug: 26029690
Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
 2015-12-14 14:39:10 -08:00
Bryce Lee
3c67873f0a Improve logging in BluetoothHeadsetClientCall. 
Bug: 26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
 2015-12-08 11:22:31 -08:00