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

18689 Commits

Author SHA1 Message Date
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
86f2721e96 Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2 
am: c6fe063ddf

* commit 'c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6':
  Import translations. DO NOT MERGE
 2015-10-21 17:27:54 +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
c6fe063ddf Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 
am: 84ab40cab2

* commit '84ab40cab243ac76a83c3d15478699998ba68236':
  Import translations. DO NOT MERGE
 2015-10-21 17:06:03 +00: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
27ddeff723 Merge "Add locking when mutating RecentTasks." into mnc-dr-dev am: 1a4efb77dd am: 3e9a3f3b71 
am: 355e53ecf0

* commit '355e53ecf00fdf1adc8df5bae3cfea6e648c5de8':
  Add locking when mutating RecentTasks.
 2015-10-20 18:35:06 +00:00
Jeff Sharkey
355e53ecf0 Merge "Add locking when mutating RecentTasks." into mnc-dr-dev am: 1a4efb77dd 
am: 3e9a3f3b71

* commit '3e9a3f3b71851c86bedbfc369787a4ce0ea5f2d8':
  Add locking when mutating RecentTasks.
 2015-10-20 17:53:14 +00:00
Michael Wright
f013c3f111 resolve merge conflicts of 57a5cba606 to cw-e-dev. am: bab2b42445 
am: b959ce872c

* commit 'b959ce872c37e5f49c8f77ad188fcb9970dcce7a':
  Add SystemUI component to watch for keyboard attachment.
 2015-10-20 17:44:46 +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
Michael Wright
b959ce872c resolve merge conflicts of 57a5cba606 to cw-e-dev. 
am: bab2b42445

* commit 'bab2b424453e556a2e7bb9470d70673793dd82df':
  Add SystemUI component to watch for keyboard attachment.
 2015-10-20 17:23:23 +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
0fdcc66177 Merge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2 am: 574b5f71e8 
am: 011f9eb1fc

* commit '011f9eb1fcdfd5bda83185ee2190664b3bc3f22f':
  Reload content description of KeyButtonView
 2015-10-20 00:32:09 +00:00
Adrian Roos
011f9eb1fc Merge "Reload content description of KeyButtonView" into mnc-dr-dev am: 9a345f31f2 
am: 574b5f71e8

* commit '574b5f71e80cb5b205dcca2d9ef33820e33a850e':
  Reload content description of KeyButtonView
 2015-10-19 23:50:19 +00: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
Geoff Mendal
5e4863205e Import translations. DO NOT MERGE 
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
 2015-10-19 07:01:55 -07:00
Chris Wren
fec413dbea am 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev 
* commit '9c25e23c4b571f9c9ff3fd69408c4cfd03385e82':
  count notification peeks by window action
 2015-10-17 21:46:00 +00:00
Chris Wren
9c25e23c4b am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev 
* commit '3472f18e0218c7d7a991da50db8251471fd8c25d':
  count notification peeks by window action
 2015-10-17 21:41:39 +00:00
Chris Wren
3472f18e02 am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev 
* commit 'c7f2058cefd00bdce31a77646afa407bdf269809':
  count notification peeks by window action
 2015-10-17 21:35:25 +00:00
Chris Wren
c7f2058cef Merge "count notification peeks by window action" into mnc-dr-dev 2015-10-17 21:30:37 +00:00
Adrian Roos
3bab515b19 Reload content description of KeyButtonView 
Reload the content description whenever the
configuration changes.

Bug: 24977838
Change-Id: I875f0d83976b7d007a9bb2e56b28ff8fb6365a38
 2015-10-16 23:53:12 +00:00
Selim Cinek
4d655e7b98 am 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 
* commit '4135092ce9381d5545f6ef1625a348c969614b33':
  Stopping chronometers now when the shade is closed
 2015-10-16 23:44:59 +00:00
Selim Cinek
4135092ce9 am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 
* commit '303e5c410c17b2be84051b3692635e6e24e37530':
  Stopping chronometers now when the shade is closed
 2015-10-16 23:40:12 +00:00
Selim Cinek
303e5c410c am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 
* commit 'b9a73d2ce34b35684a282c8521d65f52fea1197a':
  Stopping chronometers now when the shade is closed
 2015-10-16 23:34:43 +00:00