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

17859 Commits

Author SHA1 Message Date
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
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
0705d75d69 Import translations. DO NOT MERGE 
Change-Id: Idaba78408b31b9161ac35fbcf940266b491ee296
Auto-generated-cl: translation import
 2015-10-21 05:14:07 -07: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
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
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
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
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
Selim Cinek
98713a4fcf Stopping chronometers now when the shade is closed 
Bug: 23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12
 2015-10-16 15:58:10 -07:00
Chris Wren
063926bda7 count notification peeks by window action 
Bug: 20751989
Change-Id: I9b1093b98f303656a299c18b503c1d8c9f032335
 2015-10-16 16:26:41 -04:00
Julia Reynolds
542052dd83 am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit '96faf5c8fad5114dda807eee1c94a1c0dc021fe8':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:48:47 +00:00
Julia Reynolds
96faf5c8fa am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit 'a762c210d2901bedce5b7972eb139c4d5e59dcd1':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:41:54 +00:00
Julia Reynolds
8e2d2bbeec Add 'until next alarm' option to QS zen panel. 
Unlike the implementation in LMR1, this is a countdown condition
(a countdown until the time of what was the next alarm when the
rule was created). The rule will not change if alarms change.
Also, alarms up to 7 days in the future will be considered.

Bug: 21648799
Change-Id: Id7fa9dbdbad1539e4da19b1d0e0c4395bb13e6cb
(cherry picked from commit 0842fe87b27b9e4a7aecfec25b93dba2d39f398a)
 2015-10-15 17:02:00 -04:00
Julia Reynolds
86fdb662a3 am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '4f836839c19aed433e7b1913ce05ccb129743fd7':
  Selectively show zen footer.
 2015-10-15 13:39:28 +00:00
Julia Reynolds
4f836839c1 am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '67ea77ec3fd838e1a367ad6f367970599e599a99':
  Selectively show zen footer.
 2015-10-15 13:33:35 +00:00
Julia Reynolds
67ea77ec3f Merge "Selectively show zen footer." into mnc-dr-dev 2015-10-15 13:29:51 +00:00
Adrian Roos
67255b4403 am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit 'c007c150d5f56305e84af44d7993d8f2e6a4fc78':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:45:23 +00:00
Adrian Roos
c007c150d5 am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '8630e18a297801238efcba8760e8d850d8920a80':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:40:45 +00:00
Adrian Roos
8630e18a29 am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '31f19c444f5f9d22c81fcb339e51bee465ba10f9':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:35:33 +00:00
Winson Chung
1c36cfd210 am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'd8fed39f3c53cc7764e69a2a10ad3ece718179a2':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:52:20 +00:00
Winson Chung
d8fed39f3c am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'c7a873e356e1caa815c1830ae37a6ffb3ecf480f':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:45:35 +00:00
Winson Chung
c7a873e356 Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 2015-10-14 20:42:21 +00:00
Julia Reynolds
97eff878a4 Selectively show zen footer. 
Only show zen footer if the active stream is affected by the current
zen mode.

Bug: 23844466
Change-Id: I08770882f12f11c3458e1e48a287139480ae7aa3
(cherry picked from commit 6aa83b4ca0859c3f59413ef092f8d843f8646f0e)
 2015-10-14 20:22:56 +00:00
Geoff Mendal
7013f0c8f2 Import translations. DO NOT MERGE 
Change-Id: Iefcade8293a0fa228423e3eef730910af4a76853
Auto-generated-cl: translation import
 2015-10-14 06:59:48 -07:00
Jean-Michel Trivi
acb867f17c am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'bf76eb7cdaf1e2199217354bd6cbeaf37657486f':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:27:30 +00:00
Jean-Michel Trivi
bf76eb7cda am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'a2ed535c67a6c6fbe2ae4a086193ad68711e2129':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:22:32 +00:00
Adrian Roos
f3c9215afb am 66536146: am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit '66536146bfeac90346b898f56c7e955ad83cd005':
  Show charging speed in all locales
 2015-10-13 23:08:26 +00:00
Adrian Roos
66536146bf am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit '4673b259bc1b362fee206c7476c5fde3f53b4e20':
  Show charging speed in all locales
 2015-10-13 23:01:55 +00:00