16080 Commits

Author SHA1 Message Date
John Spurlock
6809b02df8 am 0cd2ab56: am c17968b4: am 5ddde02a: Merge "Volume: Dialog should not interfere when not showing." into mnc-dev
* commit '0cd2ab56b702a9c272f4460a4d469952f850ae25':
  Volume: Dialog should not interfere when not showing.
2015-05-19 23:03:01 +00:00
John Spurlock
0cd2ab56b7 am c17968b4: am 5ddde02a: Merge "Volume: Dialog should not interfere when not showing." into mnc-dev
* commit 'c17968b47f9e354b0003acd528cfc16cba734c40':
  Volume: Dialog should not interfere when not showing.
2015-05-19 22:48:57 +00:00
Ben Kwa
28b0ffb18d Merge "Fix UI for file moves." 2015-05-19 22:24:31 +00:00
Ben Kwa
cc3452136e Fix UI for file moves.
Change the destination picker to have a "MOVE" button when moving files.

BUG=20880263

Change-Id: I69686a2f13daa0f0048113e1a2ad71dd37b3de1c
2015-05-19 15:22:36 -07:00
John Spurlock
c17968b47f am 5ddde02a: Merge "Volume: Dialog should not interfere when not showing." into mnc-dev
* commit '5ddde02ac243b28ae9189a9f7ba64ba99c2d11d7':
  Volume: Dialog should not interfere when not showing.
2015-05-19 16:53:19 +00:00
Xiyuan Xia
6111ebb102 am 50d8d16e: am d02a287e: am 00d1fcf7: Merge "No input instead of disabling password entry" into mnc-dev
* commit '50d8d16ee453287723cc7f05cd2b32363564d014':
  No input instead of disabling password entry
2015-05-19 16:41:09 +00:00
John Spurlock
5ddde02ac2 Merge "Volume: Dialog should not interfere when not showing." into mnc-dev 2015-05-19 16:40:06 +00:00
Xiyuan Xia
e0c05b1a1d am b1de5bf2: am eea85acd: am 1ca35418: Merge "Abort swipe up gesture when long press is detected" into mnc-dev
* commit 'b1de5bf2df19e4c23cec8912d29ff2dfd5563b00':
  Abort swipe up gesture when long press is detected
2015-05-19 16:34:22 +00:00
Xiyuan Xia
50d8d16ee4 am d02a287e: am 00d1fcf7: Merge "No input instead of disabling password entry" into mnc-dev
* commit 'd02a287e431ce95eb2f14177ca528e3cf61ecbc6':
  No input instead of disabling password entry
2015-05-19 16:30:59 +00:00
John Spurlock
e56efa71bb Volume: Dialog should not interfere when not showing.
Also dump volume dialog controller state properly as part of
the sysui service dump.

Bug: 21207717
Change-Id: I5146d4159d9b017bc91852b91a585725821c19d9
2015-05-19 12:26:25 -04:00
Xiyuan Xia
b1de5bf2df am eea85acd: am 1ca35418: Merge "Abort swipe up gesture when long press is detected" into mnc-dev
* commit 'eea85acd9fd1e5aa2f3efed0369d3e5c2597f99b':
  Abort swipe up gesture when long press is detected
2015-05-19 16:20:00 +00:00
Xiyuan Xia
d02a287e43 am 00d1fcf7: Merge "No input instead of disabling password entry" into mnc-dev
* commit '00d1fcf7372155510930a2ea759d08bf8db93b61':
  No input instead of disabling password entry
2015-05-19 16:18:58 +00:00
Xiyuan Xia
00d1fcf737 Merge "No input instead of disabling password entry" into mnc-dev 2015-05-19 16:06:06 +00:00
Xiyuan Xia
cead91974a No input instead of disabling password entry
So that the keyboard does not come and go all the time.

Bug:21271425
Change-Id: I9ba2fa7034777885a6e53f135eca31fc89568e9d
2015-05-19 09:04:43 -07:00
Xiyuan Xia
eea85acd9f am 1ca35418: Merge "Abort swipe up gesture when long press is detected" into mnc-dev
* commit '1ca3541857043b549a5aed04559f5e303cb84422':
  Abort swipe up gesture when long press is detected
2015-05-19 15:57:00 +00:00
Xiyuan Xia
1ca3541857 Merge "Abort swipe up gesture when long press is detected" into mnc-dev 2015-05-19 15:44:44 +00:00
Robin Lee
a5598cca1f am 4f874010: am 855867b1: am 3e5484d4: Merge "Support cross-user VPN calls (with permission)" into mnc-dev
* commit '4f874010a4638ead7e45bbb73478ef93dca2c7ce':
  Support cross-user VPN calls (with permission)
2015-05-19 10:48:31 +00:00
Robin Lee
4f874010a4 am 855867b1: am 3e5484d4: Merge "Support cross-user VPN calls (with permission)" into mnc-dev
* commit '855867b1ef8b760d0695921fa7ba040785416a70':
  Support cross-user VPN calls (with permission)
2015-05-19 10:36:56 +00:00
Robin Lee
855867b1ef am 3e5484d4: Merge "Support cross-user VPN calls (with permission)" into mnc-dev
* commit '3e5484d452cdf9f98e3c0e1abfe4a7297753cb5e':
  Support cross-user VPN calls (with permission)
2015-05-19 10:26:03 +00:00
Robin Lee
3e5484d452 Merge "Support cross-user VPN calls (with permission)" into mnc-dev 2015-05-19 10:14:59 +00:00
Adrian Roos
526914496a am 8afb01ab: am 35e3db74: am 7034954f: Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
* commit '8afb01ab26a55a250210a3d20273e4fa50ffaa95':
  Prevent EmergencyDialer restart from Keyguard
2015-05-19 00:16:45 +00:00
Adrian Roos
8afb01ab26 am 35e3db74: am 7034954f: Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
* commit '35e3db744e0f79a9ed84cfc97997abc371f1d3dd':
  Prevent EmergencyDialer restart from Keyguard
2015-05-19 00:12:17 +00:00
Selim Cinek
7d202e99f0 am 6a2f33da: am 6bfaa5bb: am 6f145cf0: Fixed a bug that the more card was gone
* commit '6a2f33dae777e247863d84d4b4d2e018fbbed248':
  Fixed a bug that the more card was gone
2015-05-19 00:10:18 +00:00
Selim Cinek
6a2f33dae7 am 6bfaa5bb: am 6f145cf0: Fixed a bug that the more card was gone
* commit '6bfaa5bb8c95d5d3cbd182e85859a6a7f52fcb69':
  Fixed a bug that the more card was gone
2015-05-19 00:05:09 +00:00
Adrian Roos
35e3db744e am 7034954f: Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev
* commit '7034954f91c94b0f07db1417a016ec9d6f7775ec':
  Prevent EmergencyDialer restart from Keyguard
2015-05-18 23:56:56 +00:00
Adrian Roos
7034954f91 Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev 2015-05-18 23:48:15 +00:00
Adrian Roos
b5947e0127 Prevent EmergencyDialer restart from Keyguard
Fixes a flicker caused by clearing the emergency
dialer task when it was already launched. Instead
we now only clear activities on top of the dialer.

Bug: 20728640
Change-Id: I8a1214c4726e4848587a81e9050a6ab63759b64f
2015-05-18 16:39:14 -07:00
Selim Cinek
6bfaa5bb8c am 6f145cf0: Fixed a bug that the more card was gone
* commit '6f145cf0c02fdbd324ff2d62a86f19bff5eb7ebe':
  Fixed a bug that the more card was gone
2015-05-18 23:31:33 +00:00
Selim Cinek
6f145cf0c0 Fixed a bug that the more card was gone
Bug: 21155295
Change-Id: I7e332df71980b5a553e66b928c3e994849470ab3
2015-05-18 22:58:16 +00:00
Robin Lee
3b3dd942ec Support cross-user VPN calls (with permission)
Settings and SystemUI need to act on other users than USER_OWNER.

This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing
CONTROL_VPN checks, so the number of processes able to interfere with
other profiles' VPNs should be quite small.

Bug: 20692490
Bug: 20747154
Bug: 20872408
Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
2015-05-18 23:35:31 +01:00
Riley Andrews
412490564d am 613cce81: am 35f97c07: am 5ac56502: Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
* commit '613cce81251c5fafc7bd0cc8a93cdfc5eef66cee':
  Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
2015-05-18 20:40:20 +00:00
Riley Andrews
613cce8125 am 35f97c07: am 5ac56502: Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
* commit '35f97c0725cbf790bad137cdba8e43d1240130a4':
  Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
2015-05-18 20:30:18 +00:00
Riley Andrews
35f97c0725 am 5ac56502: Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
* commit '5ac56502e3babcd43fd32bd0d4a295466b076500':
  Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
2015-05-18 20:16:01 +00:00
Paul Jensen
89f0db26cc am 208012ad: am 40b76194: am 8845f839: Merge "Don\'t leak NetworkListens in captive portal app." into mnc-dev
* commit '208012ad622026e44f841537d7805b4b5202ff3d':
  Don't leak NetworkListens in captive portal app.
2015-05-18 20:05:35 +00:00
Paul Jensen
208012ad62 am 40b76194: am 8845f839: Merge "Don\'t leak NetworkListens in captive portal app." into mnc-dev
* commit '40b76194b7f87e7a6c40277f0ff8bb80587e0fd2':
  Don't leak NetworkListens in captive portal app.
2015-05-18 19:58:19 +00:00
Riley Andrews
5ac56502e3 Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
Bug 21037890
Change-Id: Ieb29be3ff68f3db3f07df02f171325ed77915fdf
2015-05-18 19:56:54 +00:00
Paul Jensen
40b76194b7 am 8845f839: Merge "Don\'t leak NetworkListens in captive portal app." into mnc-dev
* commit '8845f839e3a72cee0d469a143acf7bba30f38035':
  Don't leak NetworkListens in captive portal app.
2015-05-18 19:51:38 +00:00
Paul Jensen
8845f839e3 Merge "Don't leak NetworkListens in captive portal app." into mnc-dev 2015-05-18 19:41:09 +00:00
Jason Monk
ed6b13f7d2 am b602495c: am 886a1400: am b6f567db: Merge "Show data icon when appropriate." into mnc-dev
* commit 'b602495cae90833fb89eaeff8986673a3c708e33':
  Show data icon when appropriate.
2015-05-18 17:45:46 +00:00
Jason Monk
b602495cae am 886a1400: am b6f567db: Merge "Show data icon when appropriate." into mnc-dev
* commit '886a1400bf1f0f49eebaf8208603c0f6d6f939b1':
  Show data icon when appropriate.
2015-05-18 17:31:19 +00:00
Jason Monk
886a1400bf am b6f567db: Merge "Show data icon when appropriate." into mnc-dev
* commit 'b6f567db95865fa3b104c70bc3b9b61835cce4f9':
  Show data icon when appropriate.
2015-05-18 17:18:20 +00:00
Paul Jensen
868f6243bc Don't leak NetworkListens in captive portal app.
Bug:21146632
Change-Id: I934044a2eec89a47185add881a74de5669cd0f89
2015-05-18 12:48:28 -04:00
Jason Monk
9dd97bd750 am e4a5cacc: am 52d8b6fa: am 99f6977d: Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev
* commit 'e4a5caccb6e224da038ef9619d82c3e31d6a5039':
  Move NetworkController broadcasts/listeners to BG
2015-05-18 16:07:57 +00:00
Jason Monk
e4a5caccb6 am 52d8b6fa: am 99f6977d: Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev
* commit '52d8b6fa306f6d681686dccaddbe8636cf60d800':
  Move NetworkController broadcasts/listeners to BG
2015-05-18 15:55:52 +00:00
John Spurlock
574907b8f6 am ba6a25e0: am 9a7b2c89: am 59c15e30: Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev
* commit 'ba6a25e09c0e8e448b708a30a29623856ead4fec':
  DND: Fix locale and rtl issues in QS detail panel.
2015-05-18 15:50:27 +00:00
Jason Monk
33f8ae7543 Show data icon when appropriate.
Show it in the status bar when its a default network, but always show
it in QS when its connected, so that users can know its connected.

Also fix the tests.

Bug: 18776546
Change-Id: I553588fc6850b0c2ef6e6015b313222bf4c786e7
2015-05-18 11:49:24 -04:00
Jason Monk
52d8b6fa30 am 99f6977d: Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev
* commit '99f6977d3cbde054307cc1001cdc50f67399e4ca':
  Move NetworkController broadcasts/listeners to BG
2015-05-18 15:43:26 +00:00
John Spurlock
ba6a25e09c am 9a7b2c89: am 59c15e30: Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev
* commit '9a7b2c89888a490e007f7f037709d64b92c705fc':
  DND: Fix locale and rtl issues in QS detail panel.
2015-05-18 15:37:59 +00:00
Jason Monk
99f6977d3c Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev 2015-05-18 15:35:23 +00:00
Jason Monk
07b75fe65d Move NetworkController broadcasts/listeners to BG
Also do some refactoring to avoid having to sets of callback interfaces
with 75% of the same data.

Bug: 19520495
Change-Id: Ife1c71174c0d6a21f924f7de3cb2f97a04c3d5a1
2015-05-18 11:31:49 -04:00