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

19918 Commits

Author SHA1 Message Date
Julia Reynolds
c72c931eb8 resolved conflicts for 429e7dcd to master 
Change-Id: Id0aca75915a054253d032d333defba1a38b80abe
 2015-10-16 16:25:40 -04:00
Julia Reynolds
429e7dcd09 am 542052dd: am 96faf5c8: am a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev 
* commit '542052dd83e89f7cebc07aa0004a8592efc12364':
  Add 'until next alarm' option to QS zen panel.
 2015-10-16 19:55:25 +00: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
Steve McKay
5ff818e985 Merge "Performe save when ENTER is pressed." 2015-10-15 18:48:19 +00:00
Jason Monk
42c8b4e734 Make QS header less broken on tablets 
Instead have the prototype header a little broken

Bug: 24963222
Change-Id: Ic6f2aa2dc003fbb603feb01bef3af79314d6f24e
 2015-10-15 13:46:47 -04:00
Steve McKay
0c2a0a811f Performe save when ENTER is pressed. 
Push save enabling logic into SaveFragment, let it figure it out.
Don't assume DirectoryFragment is present in BaseActivity.
Permit DirectoryFragment#get to return null when not present.

Bug: 24305559
Bug: 24955068
Change-Id: Ib50d674b16ba48dcefb6e5b73055120c3e7c6dba
 2015-10-15 10:35:55 -07:00
Julia Reynolds
607479d109 am 86fdb662: am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '86fdb662a3d9c34099248910756ca18cd0b3b2f1':
  Selectively show zen footer.
 2015-10-15 13:43:17 +00: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
62692b22fb Send next alarm's show intent via PendingIntent 
Also send all IntentTile intents via PendingIntent.

Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
 2015-10-14 20:23:02 -07:00
Adrian Roos
d06f20f9e1 am 67255b44: am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '67255b4403df91d8405506ecac6965367093cd6b':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:54:34 +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
c89d516e09 Fixing merge conflict from DR to master. 
Change-Id: Id76602204dffa2745534e8290a14e407de639c0b
 2015-10-14 14:58:51 -07:00
Winson Chung
1723305878 am f3eb33f4: am 1c36cfd2: am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'f3eb33f437948118a9b08767f18b76f6f83ca52d':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 21:06:25 +00:00
Julia Reynolds
d772af29d6 Merge "Add 'until next alarm' option to QS zen panel." 2015-10-14 21:00:58 +00:00
Winson Chung
f3eb33f437 am 1c36cfd2: am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit '1c36cfd2102a136f80daef6bf1011503b4e5cca9':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:58:48 +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
Julia Reynolds
0842fe87b2 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
 2015-10-14 13:12:52 -04: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
Geoff Mendal
a4f261cf23 Import translations. DO NOT MERGE 
Change-Id: I9a9548a9eaf6b7a0dd4909853c257ef97aedba5a
Auto-generated-cl: translation import
 2015-10-14 05:50:48 -07:00
Jun Mukai
9086ca9d1b Merge "Fix the logic for mouse event handling." 2015-10-14 07:07:52 +00:00
Jean-Michel Trivi
6135f32004 am acb867f1: am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'acb867f17c34828d14b3c71186253a269d85707c':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:32:38 +00: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
0e79506b1d am 5ca30808: am f3c9215a: am 66536146: am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit '5ca3080825a6f294b70c3b1409f3f0f0247a5294':
  Show charging speed in all locales
 2015-10-13 23:21:38 +00:00
Adrian Roos
5ca3080825 am f3c9215a: am 66536146: am 4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev 
* commit 'f3c9215afbd3b0100a7762a91d7e4db56b902224':
  Show charging speed in all locales
 2015-10-13 23:13:25 +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
Jean-Michel Trivi
a2ed535c67 NotificationPlayer supports MediaPlayer errors 
If an error is reported while trying to play a notification,
 behave as if the playback had completed.

Bug 21093153

Change-Id: Iedc7691d0b8f4d68ad75cb04292a5d7d9350552f
(cherry picked from commit a25f6fcfed280136a16ce5800fcaabae17291dd7)
 2015-10-13 23:00:52 +00:00
Winson
d477d53dee Fixing issue with transparent recents. 
Bug: 24742707
Change-Id: I4ef66bdb15b2c8f8a98c9d1f87d12e1c191733d4
 2015-10-13 22:15:17 +00:00
Adrian Roos
f142cac734 Show charging speed in all locales 
Bug: 24167496
Change-Id: I3e883eeca002e86d4df30c2b238e18bd63bbddea
 2015-10-13 21:54:36 +00:00
Ben Kwa
097fb1317a Merge "Fix the position of the "Recents" root in DocumentsUI." 2015-10-13 19:54:23 +00:00
Ben Kwa
b2865d2339 Fix the position of the "Recents" root in DocumentsUI. 
BUG=24329078

Change-Id: Ia71b80b2075b34076c4f7802bcc45a13e95775e6
 2015-10-13 12:17:13 -07:00
Filip Gruszczynski
f48b585725 Pass target stack id when launching from recents. 
This fixes recents to freeform activities animation problem when the
activities where previously in a non-freeform stack. Their stack id
still reports fullscreen, even though they will enter freeform. Because
of this we need to pass the target stack id with the call that creates
animation spec.

Bug: 24814340
Change-Id: Iea589d458c29c3644f351b29f51e8f8cfb5f90e3
 2015-10-13 11:09:06 -07:00
Ben Kwa
15a1fc375e Merge "Reorganize DocumentsUI roots fragment to match mocks." 2015-10-13 14:42:52 +00:00
Ben Kwa
0c64308240 Reorganize DocumentsUI roots fragment to match mocks. 
BUG=24329078

Change-Id: I80fe7b939772d929236aa9e0e6fa44cdb606a038
 2015-10-13 07:41:06 -07:00
Winson
c14a11e882 Ensure we update the active pointer id on pointer up/down. 
Bug: 24841350
Change-Id: Id5d91ee8adbb638caf66976d701cfbc0befaca04
 2015-10-12 23:54:59 +00:00
Steve McKay
260c6980ce Treat UNKNOWN tooltype events as Mouse events. 
Temporary fix for CTS.
Eventually we'll need to update UiAutomator to support specific input tooltypes.

Bug: 24544391
Change-Id: Ief339d0d35c4305811928e9605b535c7ef230f7b
 2015-10-12 16:24:07 -07:00
Jason Monk
c7e19d9f14 Merge "Quick prototype of new header" 2015-10-12 20:16:41 +00:00
Jason Monk
c34befb319 Quick prototype of new header 
- Has first 4 quick tiles shown in collapsed mode
 - Shows date + settings gear in expanded mode
 - Still has a few gaps (alarms probably don't work)
 - Fix issue with placement of cell data type indicator

Change-Id: I629798b96f4f088fde47c7b67feea304dcc8450c
 2015-10-12 16:15:26 -04:00
Winson Chung
3f669082aa Merge "Allowing multiple preferred drag regions for tablets." 2015-10-12 18:38:59 +00:00
Winson
882072baac Allowing multiple preferred drag regions for tablets. 
Change-Id: I514e501d185f4139ce21798fc92bc931626c8239
 2015-10-12 11:26:33 -07:00