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

17277 Commits

Author SHA1 Message Date
Geoff Mendal
337495bded Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 19:36:01 +00:00
Geoff Mendal
db4f28692a Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 19:35:20 +00:00
Geoff Mendal
9865051825 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 19:35:02 +00:00
Geoff Mendal
6b3e7808d6 Import translations. DO NOT MERGE 
Change-Id: Ic500efe78e3dd02f8dd74b8c687443bbe559355b
Auto-generated-cl: translation import
 2015-10-26 12:06:21 -07:00
Geoff Mendal
48dfdda0e9 Import translations. DO NOT MERGE 
Change-Id: I07f75df116b723529d96cacf5ac8431caafb022d
Auto-generated-cl: translation import
 2015-10-26 12:04:18 -07:00
Geoff Mendal
79c07f4c63 Import translations. DO NOT MERGE 
Change-Id: I9ecfe0ecad2b5aa88fc4b60d6d5f8e718ec19bcf
Auto-generated-cl: translation import
 2015-10-26 12:02:09 -07:00
Geoff Mendal
8961b24ff2 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-26 18:59:41 +00:00
Geoff Mendal
7ced195dd8 Import translations. DO NOT MERGE 
Change-Id: I8a0b74d374b31531c37be9b0d8bc251300a82009
Auto-generated-cl: translation import
 2015-10-26 11:49:23 -07:00
Geoff Mendal
db2cb7bb13 Import translations. DO NOT MERGE 
Change-Id: Ia70d07e17335f2a77a0c66ff9fb906e6f6f70171
Auto-generated-cl: translation import
 2015-10-26 11:43:00 -07:00
Geoff Mendal
a1ecb9ee2b Import translations. DO NOT MERGE 
Change-Id: Iafffd8db9db17c15f46c82ba641c6f6ad83d4059
Auto-generated-cl: translation import
 2015-10-26 05:11:27 -07:00
Dmitry Torokhov
d3eee7c410 SystemUI: fix automatic pairing of BT keyboards 
am: 79f00cf06f

* commit '79f00cf06f5e70047d73b48d20910b967353b075':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:13:36 +00:00
Dmitry Torokhov
79f00cf06f SystemUI: fix automatic pairing of BT keyboards 
After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.

Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.

Bug: 24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811
 2015-10-22 10:19:32 -07:00
Daniel Sandler
b4aa8b0c5b Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev 
am: cb10c09f0a

* commit 'cb10c09f0a6c0750d79bf4f681a623fa35f4cef7':
  Delay hiding the cast icon for 3 seconds.
 2015-10-21 23:18:54 +00:00
Daniel Sandler
cb10c09f0a Merge "Delay hiding the cast icon for 3 seconds." into mnc-dr-dev 2015-10-21 23:14:50 +00:00
Dan Sandler
8fd25bf771 Delay hiding the cast icon for 3 seconds. 
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.

Bug: 19121797
Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934
 2015-10-21 15:42:48 -07:00
Selim Cinek
f9c4f745e6 Merge "Changing the ordering for heads up notifications" into mnc-dr-dev 
am: 688e046bad

* commit '688e046bad87cc722e8571b8f4180604623239a8':
  Changing the ordering for heads up notifications
 2015-10-21 20:45:17 +00:00
Selim Cinek
688e046bad Merge "Changing the ordering for heads up notifications" into mnc-dr-dev 2015-10-21 20:39:28 +00:00
Geoff Mendal
255103a79f Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 18:07:42 +00:00
Geoff Mendal
457d7bb5ab Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 18:07:12 +00:00
Geoff Mendal
9e30c4b406 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:56:23 +00:00
Geoff Mendal
6e66ac8e66 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:55:04 +00:00
Geoff Mendal
7c6d61e8eb Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 17:52:10 +00:00
Geoff Mendal
c55ea66ef2 Import translations. DO NOT MERGE 
Change-Id: I4be0631da01ad34daf596e7634630fbd2efae90e
Auto-generated-cl: translation import
 2015-10-21 10:19:50 -07:00
Geoff Mendal
a01cf41054 Import translations. DO NOT MERGE 
Change-Id: I167d766a2f76a3b6b4b121abddf1f874103a378a
Auto-generated-cl: translation import
 2015-10-21 10:16:37 -07:00
Geoff Mendal
be8fe13d12 Import translations. DO NOT MERGE 
Change-Id: Ie4b7d4378ff46c26fa5da8449fca10274beef157
Auto-generated-cl: translation import
 2015-10-21 10:03:57 -07:00
Geoff Mendal
5bb1fa58d7 Import translations. DO NOT MERGE 
Change-Id: I6766fce7213a69ce3e08ce5de869714b89e62adf
Auto-generated-cl: translation import
 2015-10-21 10:00:28 -07:00
Geoff Mendal
a400a1236c Import translations. DO NOT MERGE 
Change-Id: If77b4f540cb80ac3d88c56d043069c4fd890b81a
Auto-generated-cl: translation import
 2015-10-21 09:56:57 -07:00
Geoff Mendal
a73a642bfe Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:51:34 +00:00
Geoff Mendal
b4dc6a35d3 Import translations. DO NOT MERGE 
Change-Id: Ie451c3262cd6073b9cbf71ab8d0bc38ad212b0c4
Auto-generated-cl: translation import
 2015-10-21 09:48:43 -07:00
Geoff Mendal
88f7134584 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:45:48 +00:00
Geoff Mendal
7e1d841d63 Import translations. DO NOT MERGE 
Change-Id: Ib804ad4db26e8029d8c55ccda9046273baf93de3
Auto-generated-cl: translation import
 2015-10-21 09:45:23 -07:00
Geoff Mendal
7f174ff665 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:33 +00:00
Geoff Mendal
55bc169d50 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:44:08 +00:00
Geoff Mendal
04733e23a3 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:43:21 +00:00
Geoff Mendal
cd000a2228 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-21 16:42:29 +00:00
Geoff Mendal
8caa78eccb Import translations. DO NOT MERGE 
Change-Id: I9ee163f9a6b6bc4150c8661f3087385b5415dd0b
Auto-generated-cl: translation import
 2015-10-21 09:42:17 -07:00
Geoff Mendal
5fafafc434 Import translations. DO NOT MERGE 
Change-Id: I74489702454570e28841759451b47d7381dcf8c7
Auto-generated-cl: translation import
 2015-10-21 09:39:05 -07:00
Geoff Mendal
91898cca7d Import translations. DO NOT MERGE 
Change-Id: I2dfb95a393fe97360dc2fff6f849c727cb6a180b
Auto-generated-cl: translation import
 2015-10-21 09:35:36 -07:00
Geoff Mendal
65855a104b Import translations. DO NOT MERGE 
Change-Id: Iaef98e762ece5d69ed668ca83daecc0273197bf4
Auto-generated-cl: translation import
 2015-10-21 09:32:22 -07:00
Geoff Mendal
efb0f8d77f Import translations. DO NOT MERGE 
Change-Id: Id94c0578c377d92e038affd93bf25a07b22e9d7d
Auto-generated-cl: translation import
 2015-10-21 09:29:09 -07:00
Geoff Mendal
fde4111eea Import translations. DO NOT MERGE 
Change-Id: I03353dbedeb1204ce7cd07577257aa070ce19b2f
Auto-generated-cl: translation import
 2015-10-21 07:18:52 -07:00
Geoff Mendal
0705d75d69 Import translations. DO NOT MERGE 
Change-Id: Idaba78408b31b9161ac35fbcf940266b491ee296
Auto-generated-cl: translation import
 2015-10-21 05:14:07 -07:00
Selim Cinek
2ae7107d0e Changing the ordering for heads up notifications 
In the new ranking, notifications with fullscreen
intents always take priority over those without,
such that when you get a call and a message
in succession, you would always see the
call on top and are able to pick it up.

Bug: 22778349
Change-Id: Ia9aaf009998fc9493f513dc71f2649d38ccf7a79
 2015-10-20 23:17:59 +00:00
Jeff Sharkey
3e9a3f3b71 Merge "Add locking when mutating RecentTasks." into mnc-dr-dev 
am: 1a4efb77dd

* commit '1a4efb77dd3c503634f1f6495d931d1a570f51f5':
  Add locking when mutating RecentTasks.
 2015-10-20 17:33:57 +00:00
Jeff Sharkey
1a4efb77dd Merge "Add locking when mutating RecentTasks." into mnc-dr-dev 2015-10-20 17:22:27 +00:00
Michael Wright
bab2b42445 resolve merge conflicts of 57a5cba606 to cw-e-dev. 
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
 2015-10-20 17:06:27 +01:00
Michael Wright
57a5cba606 Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev 2015-10-20 15:31:01 +00:00
Jeff Sharkey
a11234794a Add locking when mutating RecentTasks. 
Otherwise there is a really rare race condition where we try tearing
down the tasks while we're still setting them up.

Bug: 25078914
Change-Id: Icf89241f9abec3fadc8606cfb4fbc029bbe91515
 2015-10-19 17:46:08 -07:00
Adrian Roos
574b5f71e8 Merge "Reload content description of KeyButtonView" into mnc-dr-dev 
am: 9a345f31f2

* commit '9a345f31f23fc581f9ce501e854c821e865920ca':
  Reload content description of KeyButtonView
 2015-10-19 23:43:32 +00:00
Adrian Roos
9a345f31f2 Merge "Reload content description of KeyButtonView" into mnc-dr-dev 2015-10-19 23:26:47 +00:00