Commit Graph

22244 Commits

Author SHA1 Message Date
Robin Lee
3754be20a5 Merge "Change VPN failure notification to dialog" into nyc-dev am: dc1e59a314
am: c9bc607505

* commit 'c9bc6075055e99f09c4b8d638ccf00ee279ed5a3':
  Change VPN failure notification to dialog

Change-Id: I88ab3523a9f98e44e7c356e60ef989e432efa88e
2016-04-22 16:11:07 +00:00
Jason Monk
9e10f10a4f Merge "Attempt to fix receiver registering problems" into nyc-dev am: 8dbc166353
am: 5fddbcd846

* commit '5fddbcd846aefdd875b6dd7709d3724591cba06d':
  Attempt to fix receiver registering problems

Change-Id: Ib861c6aef14a2235008d40509cb95b2410f1b069
2016-04-22 16:11:06 +00:00
Jason Monk
5cc3730815 Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev am: af6236d06f
am: 7014023f5d

* commit '7014023f5d291b6bebc0601dd221934c89143716':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I874d3910be0b1c808ab63f6fa9e9dda1a0731a47
2016-04-22 16:11:05 +00:00
Robin Lee
c9bc607505 Merge "Change VPN failure notification to dialog" into nyc-dev
am: dc1e59a314

* commit 'dc1e59a3147dfef7c582f2881e25d504025baa6a':
  Change VPN failure notification to dialog

Change-Id: I9209c010bd1bf3d0d7b18bef32c05b302354494f
2016-04-22 16:08:56 +00:00
Jason Monk
5fddbcd846 Merge "Attempt to fix receiver registering problems" into nyc-dev
am: 8dbc166353

* commit '8dbc16635341e7c52454d3faf806dc228502f265':
  Attempt to fix receiver registering problems

Change-Id: I36fd2eba3c451a3c509ea0e5da9611a91af239e6
2016-04-22 16:08:55 +00:00
Jason Monk
7014023f5d Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
am: af6236d06f

* commit 'af6236d06f1be85bc52e04e9cad8478035a677ab':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I627072a521c4633abe6f2493ff641aea78ad5b86
2016-04-22 16:08:55 +00:00
Robin Lee
2bffd33441 Merge "Change VPN failure notification to dialog" into nyc-dev
am: dc1e59a314

* commit 'dc1e59a3147dfef7c582f2881e25d504025baa6a':
  Change VPN failure notification to dialog

Change-Id: I15d01551a3f941a6061c371bde6210ee8df89428
2016-04-22 16:08:54 +00:00
Jason Monk
762f0e137c Merge "Attempt to fix receiver registering problems" into nyc-dev
am: 8dbc166353

* commit '8dbc16635341e7c52454d3faf806dc228502f265':
  Attempt to fix receiver registering problems

Change-Id: Ief3d38f0a8ad3ebe6df95efd380e737f48af2a87
2016-04-22 16:08:53 +00:00
Jason Monk
700da14d84 Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
am: af6236d06f

* commit 'af6236d06f1be85bc52e04e9cad8478035a677ab':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I1f2f8772015145bf418472f6389ea2d8f8533601
2016-04-22 16:08:52 +00:00
Robin Lee
dc1e59a314 Merge "Change VPN failure notification to dialog" into nyc-dev 2016-04-22 16:00:15 +00:00
Jason Monk
8dbc166353 Merge "Attempt to fix receiver registering problems" into nyc-dev 2016-04-22 15:47:44 +00:00
Jason Monk
af6236d06f Merge "Don't link to MobileNetworkSettings unless admin user" into nyc-dev 2016-04-22 15:47:39 +00:00
Jason Monk
8b986f5f73 Attempt to fix receiver registering problems
When in doubt, post to main thread.

Also clean up the listening state just in case there were any
doubts about it.

Change-Id: I9ab85781f38b0f694dc46ed5a953506ef10c5778
Fixes: 28319383 (Fingers crossed)
2016-04-22 11:40:13 -04:00
Mihai Nita
f6d029bd83 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am: 65515931e9 am: 691899e029
am: c972e7bdc1

* commit 'c972e7bdc18dcbbda5306a97443ee338217f5a3e':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: Ifa6b9a57b00acca0273eb4f157e1885efb3d51db
2016-04-22 14:54:38 +00:00
Mihai Niță
c972e7bdc1 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am: 65515931e9
am: 691899e029

* commit '691899e029736f26d26d0209b9ea4fd0390b64f2':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: Icf01017bdc56d3aa8249af3efa84340fc815d7c8
2016-04-22 14:52:15 +00:00
Mihai Nita
691899e029 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev
am: 65515931e9

* commit '65515931e98341e17cf6207b363dbe3f4399fcfd':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: I8726a6ce617f2c3347b00bc7ac857fd1ba8f7b47
2016-04-22 14:49:55 +00:00
Mihai Nita
6081857cea Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev
am: 65515931e9

* commit '65515931e98341e17cf6207b363dbe3f4399fcfd':
  Add accessibility actions to the drag-and-drop locale list

Change-Id: Ie9fae7049d30f7812dfde400b65800e2f36e8e9b
2016-04-22 14:49:53 +00:00
Mihai Niță
65515931e9 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev 2016-04-22 14:40:44 +00:00
Jason Monk
3f185ccbde Don't link to MobileNetworkSettings unless admin user
Change-Id: Id497952b48b92dfb834dd9ffbdd4b987dc96e9a2
Fixes: 26881900
2016-04-22 10:24:55 -04:00
Robin Lee
d759df2b39 Update "you\'re already connected to VPN" strings am: c9bf2ac95e
am: ac7efa6cf7

* commit 'ac7efa6cf705c334614c2f0974a55bd12fa41e7f':
  Update "you're already connected to VPN" strings

Change-Id: Ifc529e431b535e12971c17532382b3844737fe21
2016-04-22 14:11:27 +00:00
Robin Lee
ac7efa6cf7 Update "you\'re already connected to VPN" strings
am: c9bf2ac95e

* commit 'c9bf2ac95e346f0c279436aa1f37d5bea6d2443e':
  Update "you're already connected to VPN" strings

Change-Id: I7d069addf8c7026206222a3d273a3860c65daf53
2016-04-22 14:09:14 +00:00
Robin Lee
501af08b83 Update "you\'re already connected to VPN" strings
am: c9bf2ac95e

* commit 'c9bf2ac95e346f0c279436aa1f37d5bea6d2443e':
  Update "you're already connected to VPN" strings

Change-Id: I7ebc8cb060748f8bbcaf694572d90585d7b2a744
2016-04-22 14:09:13 +00:00
Robin Lee
2821067709 Change VPN failure notification to dialog
It's pointless, verging on antipattern, to pop up a notification that
points to the screen we're already on, especially when that notification
is telling us something really high-priority ("your connection failed").

Change-Id: Idf0c219adcefd64b235960f3239a70b059213f7d
Fix: 27374485
2016-04-22 15:04:43 +01:00
Robin Lee
c9bf2ac95e Update "you're already connected to VPN" strings
Change-Id: I0e64a612b47655a0d74880bc45987c8cd2272ea8
Fix: 28303500
(cherry picked from commit 3e293cb63f)
2016-04-22 13:59:44 +00:00
Robin Lee
3497abfdcc Merge "Update "you're already connected to VPN" strings" 2016-04-22 13:55:09 +00:00
TreeHugger Robot
e39069f5ee Merge "Removed obsolete preference." 2016-04-22 13:37:52 +00:00
Victor Chang
38360c7752 Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 am: 794eb82166
am: 1471de9f51

* commit '1471de9f5107072371297a821a521a43a6140be5':
  Disable trust button when no screenlock is set

Change-Id: I521be18bfac3be4128b34049ea4f5dd6c56511e3
2016-04-22 11:20:16 +00:00
Victor Chang
1471de9f51 Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989
am: 794eb82166

* commit '794eb82166b048db95749154cf1b60e6fd62954f':
  Disable trust button when no screenlock is set

Change-Id: I36d25ffe4b1b854f5b57a89244b9f099d3b87e9e
2016-04-22 11:17:58 +00:00
Victor Chang
794eb82166 Merge "Disable trust button when no screenlock is set" into nyc-dev
am: 8f5c694989

* commit '8f5c6949894ac0ccafa7371b4bb872abbfe41de9':
  Disable trust button when no screenlock is set

Change-Id: I30426f91728ea924a9e02c08111c76a100607910
2016-04-22 11:15:45 +00:00
Victor Chang
6e7c3db5a1 Merge "Disable trust button when no screenlock is set" into nyc-dev
am: 8f5c694989

* commit '8f5c6949894ac0ccafa7371b4bb872abbfe41de9':
  Disable trust button when no screenlock is set

Change-Id: Ia77ade5bb72dbb3de77a12ca4a6f921b4eb851d8
2016-04-22 11:15:44 +00:00
Victor Chang
8f5c694989 Merge "Disable trust button when no screenlock is set" into nyc-dev 2016-04-22 11:02:42 +00:00
Robin Lee
3e293cb63f Update "you're already connected to VPN" strings
Change-Id: I0e64a612b47655a0d74880bc45987c8cd2272ea8
Fix: 28303500
2016-04-22 11:31:08 +01:00
Tony Mak
abe8cd67e4 Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071 am: 968691d94d
am: a0b492a3c8

* commit 'a0b492a3c8003cbdc0118f9f45349ea536939efe':
  New UI to hint user about strong auth

Change-Id: Id97b4b9c0c14e6d4cd0b0d2df6018adb9bab8b3c
2016-04-22 09:44:33 +00:00
Tony Mak
a0b492a3c8 Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071
am: 968691d94d

* commit '968691d94d3bde08362b0a9a1265aa8458b7f295':
  New UI to hint user about strong auth

Change-Id: I1508805e84366b26c54f6aea724c73003501ec01
2016-04-22 09:42:06 +00:00
Tony Mak
968691d94d Merge "New UI to hint user about strong auth" into nyc-dev
am: b3146b0071

* commit 'b3146b007137f0a552025ed76e8619ad9d44c4f1':
  New UI to hint user about strong auth

Change-Id: I44f3a81ff5e2326aabd02072af8c899adc5cdf95
2016-04-22 09:39:59 +00:00
Tony Mak
4c724a3e48 Merge "New UI to hint user about strong auth" into nyc-dev
am: b3146b0071

* commit 'b3146b007137f0a552025ed76e8619ad9d44c4f1':
  New UI to hint user about strong auth

Change-Id: Ibd11eeff11e7fdb6bffd7fcfd80b751935174421
2016-04-22 09:39:55 +00:00
Tony Mak
b3146b0071 Merge "New UI to hint user about strong auth" into nyc-dev 2016-04-22 09:31:37 +00:00
Svetoslav Ganov
7f62addc10 Cleanup of the PackageInstaller API - Settings
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: Ibb21114a7a9fa28f6db68492fe37c02c1b2f0c6b
2016-04-21 20:34:53 -07:00
Mihai Nita
8e7c75986e Add accessibility actions to the drag-and-drop locale list
Dragging is not supported neither by TalkBack or the accessibility
framework at the moment. So we need custom actions to be able
to change the order of the locales.

Also, the remove functionality is difficult to discover and use
with TalkBack only, so we are also adding a "remove" action.

It only removes one locale at the time, but most users don't
really add many locales "by mistake", so there is no real need
to delete a lot of locales at once.

Bug: 28173358
Change-Id: I3566304e3d2de87cf9243d7e87631b12d72fc929
2016-04-21 17:09:51 -07:00
Maurice Lam
da19cc42f7 Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: b5e80b1c56
am: a752547483

* commit 'a752547483243ca7dee041faa8f373dd676ce48f':
  [Fingerprint] Update strings

Change-Id: I2c471b8f6eaa457063b4b9ed87e74cc6f7967f42
2016-04-21 22:28:48 +00:00
Maurice Lam
a752547483 Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3
am: b5e80b1c56

* commit 'b5e80b1c5609e9b0c27d19504426a4f978f8c4f2':
  [Fingerprint] Update strings

Change-Id: I778275d60ea567a899406c9467c7196228388991
2016-04-21 22:26:38 +00:00
Maurice Lam
b5e80b1c56 Merge "[Fingerprint] Update strings" into nyc-dev
am: 498ec55ba3

* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
  [Fingerprint] Update strings

Change-Id: I99bcc81112e55e8c1d6802ce7537d49c8aa1b081
2016-04-21 22:24:28 +00:00
Maurice Lam
2ad9f41310 Merge "[Fingerprint] Update strings" into nyc-dev
am: 498ec55ba3

* commit '498ec55ba3cc06515d9f19e4990771ce36734206':
  [Fingerprint] Update strings

Change-Id: I9f57efcaea6d856589f0cb1cce37db34f156a7f6
2016-04-21 22:24:13 +00:00
Felipe Leme
a5bc4a5d8a Removed obsolete preference.
BUG: 22817899
Change-Id: Ie2af7d5582db62caf4937b8db3df8784b293a331
2016-04-21 15:16:14 -07:00
Philip P. Moltmann
eb01628ba8 Update print jobs appropriately in the print settings.
- Always use a fresh print job as once the print job goes away it cannot
  be read. Before we were stuck with the last state which might not been
  the last state
- make loaders relative to fragment to avoid loader id duplications with
  other ids of the activity.

Fixes: 28315242
Change-Id: I57eeb64b44b5d77b2092c22b175407131f7baf97
2016-04-21 15:16:05 -07:00
Maurice Lam
498ec55ba3 Merge "[Fingerprint] Update strings" into nyc-dev 2016-04-21 22:06:04 +00:00
Mihai Nita
a920a31196 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5 am: 093817bd23
am: 59368baca7

* commit '59368baca700e813f3a35334925b2168f3a3c8f7':
  Settings: change the TTS text to use the current locale

Change-Id: I13f0f019e784f2832af597371d1b1acf11e63bac
2016-04-21 20:25:50 +00:00
yifan.bai
d9dc35c0a1 Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: c91589bddf
am: db6cedcfe7

* commit 'db6cedcfe7643d17e8dc71e1ba81a9bad4676810':
  Fix ApnSettings crash issue.

Change-Id: I0bc65723fab3a9d7d47f0a123e599f54eb3a717c
2016-04-21 20:25:49 +00:00
Robin Lee
02ba0a13a3 Merge "resolve merge conflicts of 04c7dc2 to master" 2016-04-21 20:16:06 +00:00
Mihai Niță
59368baca7 Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5
am: 093817bd23

* commit '093817bd237dd757db150689a8acdc5d75feeecc':
  Settings: change the TTS text to use the current locale

Change-Id: I962d11edeb49d1caa814a9f96248d0094a4223be
2016-04-21 20:05:36 +00:00