Commit Graph

27607 Commits

Author SHA1 Message Date
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
edc7f834ac Merge "Increase secondary text contrast on conditionals" into nyc-dev
am: 7e61f71bcc

* commit '7e61f71bccee2c3d064e9ce30b9b4a26839db49b':
  Increase secondary text contrast on conditionals

Change-Id: I80e4536dab43a38dc70b6766ce1a0c433dba00a6
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
182abfa24f Merge "Increase secondary text contrast on conditionals" into nyc-dev
am: 7e61f71bcc

* commit '7e61f71bccee2c3d064e9ce30b9b4a26839db49b':
  Increase secondary text contrast on conditionals

Change-Id: I0e7ab0ce20c0e08f214b8bf9a2bae59bc7d374e9
2016-04-22 16:08:53 +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
7e61f71bcc Merge "Increase secondary text contrast on conditionals" into nyc-dev 2016-04-22 15:47:47 +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
Android Build Merger (Role)
b89a701493 Merge "Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am: 65515931e9 am: 6081857cea" into nyc-mr1-dev-plus-aosp 2016-04-22 14:53:10 +00:00
Mihai Niță
bb1dbd389c Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am: 65515931e9
am: 6081857cea

* commit '6081857ceaa376b15f1b23ee2b458ccb46715c20':

Change-Id: Iaea76941ee5b8323c18df5a469b6b1a8d7000ed3
2016-04-22 14:53:03 +00:00
Android Build Merger (Role)
71edd846e5 Merge "Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am: 65515931e9 am: 6081857cea" into nyc-mr1-dev-plus-aosp 2016-04-22 14:52:25 +00:00
Mihai Niță
e251a9dd86 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev am: 65515931e9
am: 6081857cea

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

Change-Id: Ie2fa7a2d6d89e65078bcd37c5a5baf73a704c0b0
2016-04-22 14:52:16 +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
Android Build Merger (Role)
0669b236cc Merge "Update "you\'re already connected to VPN" strings am: c9bf2ac95e am: 501af08b83" into nyc-mr1-dev-plus-aosp 2016-04-22 14:11:37 +00:00
Robin Lee
af37987aff Update "you\'re already connected to VPN" strings am: c9bf2ac95e
am: 501af08b83

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

Change-Id: Ie5fbc79403343f26add59a960f693f7d429b9767
2016-04-22 14:11:29 +00: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
Jason Monk
ba613db853 Increase secondary text contrast on conditionals
Change-Id: Iaa2ae24aa66dc269b14eaf5fd40a2ff789939a0d
Fixes: 28178952
2016-04-22 09:59:44 -04: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
Android Build Merger (Role)
ba2b684efe Merge "Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 am: 6e7c3db5a1" into nyc-mr1-dev-plus-aosp 2016-04-22 11:18:53 +00:00
Victor Chang
5cdce685c0 Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989
am: 6e7c3db5a1

* commit '6e7c3db5a1ad0084fb086a4728ba1ddadb3d8ee9':

Change-Id: I30c35d22fbbcb4f9515a70a469be0b414e5f18f2
2016-04-22 11:18:46 +00:00
Android Build Merger (Role)
69b034362f Merge "Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989 am: 6e7c3db5a1" into nyc-mr1-dev-plus-aosp 2016-04-22 11:18:08 +00:00
Victor Chang
12a56e4758 Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989
am: 6e7c3db5a1

* commit '6e7c3db5a1ad0084fb086a4728ba1ddadb3d8ee9':
  Disable trust button when no screenlock is set

Change-Id: I9170170fbb668ee70bb3ddeb640f06662d843098
2016-04-22 11:17:59 +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
Tony Mak
721392fdc8 Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071
am: 4c724a3e48

* commit '4c724a3e484e46004caee359c4fd4153f1aa5e84':

Change-Id: I49c9b4aef6264187a2c12d1e970451e7303ffdf6
2016-04-22 09:42:59 +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
Android Build Merger (Role)
0da23fd0cb Merge "Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3 am: 2ad9f41310" into nyc-mr1-dev-plus-aosp 2016-04-21 22:26:52 +00:00
Maurice Lam
9e71bea21a Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3
am: 2ad9f41310

* commit '2ad9f41310754cc61d2c8ab55674ccdaefb904bf':
  [Fingerprint] Update strings

Change-Id: I3ac0227fc6cfc061c031fe7cfb11f26d6e025cca
2016-04-21 22:26:45 +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