Robin Lee
44fad78eaa
Merge "Update "you\'re already connected to VPN" strings am: c9bf2ac95e
am: 501af08b83" into nyc-mr1-dev-plus-aosp
...
am: 0669b236cc
* commit '0669b236cc91afea25fac21ba4888e54ff683956':
Change-Id: I80160024538f98aa57cffc62a4f691786ba84a0f
2016-04-22 14:13:46 +00:00
Robin Lee
6f0b9c99cb
Update "you\'re already connected to VPN" strings am: c9bf2ac95e
am: ac7efa6cf7
...
am: d759df2b39
* commit 'd759df2b393dc6c20fdbb683e6a904d81e4c6d97':
Update "you're already connected to VPN" strings
Change-Id: I03539ade5a8577b4678dedae932d76d55b4d3f7c
2016-04-22 14:13:45 +00: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
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
618498c071
Merge "Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989
am: 6e7c3db5a1" into nyc-mr1-dev-plus-aosp
...
am: ba2b684efe
* commit 'ba2b684efe7ec4ba3abcc4d60344bea826a195e2':
Change-Id: I73bc05cec2c9a596b33a2cfeb504b94d59f0eb57
2016-04-22 11:20:17 +00:00
Victor Chang
a0b700d8d5
Merge "Merge "Disable trust button when no screenlock is set" into nyc-dev am: 8f5c694989
am: 6e7c3db5a1" into nyc-mr1-dev-plus-aosp
...
am: 69b034362f
* commit '69b034362f87d390d41c1dcaeb252795468ac184':
Change-Id: If4d099973d8f9de6957057bed66381547f2b3f29
2016-04-22 11:20:17 +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
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
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
31ae032e99
Merge "New UI to hint user about strong auth" into nyc-dev am: b3146b0071
am: 4c724a3e48
...
am: 721392fdc8
* commit '721392fdc82be9d850ae0c749a19ea9df6690eb2':
Change-Id: I01115a9e7cb73d5fab35bf2f1a81950f68ad618d
2016-04-22 09:44:34 +00: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
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
Maurice Lam
8f1dbc1ace
Merge "Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3
am: 2ad9f41310" into nyc-mr1-dev-plus-aosp
...
am: 0da23fd0cb
* commit '0da23fd0cbec84f72ece710667284a78b19c7ed8':
Change-Id: Ia179be6060710d1b84f831498d9d441e366a370c
2016-04-21 22:28:49 +00: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
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
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
e356b03606
Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5
am: 8225f4eeb1
...
am: d3be403652
* commit 'd3be403652e78568d2b984269bf364497f775cd7':
Change-Id: I7f091d30461695ba99fe92509c8b2d9d8f6164c1
2016-04-21 20:25:51 +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
Amit Mahajan
75bbf7bcaa
Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e
am: 33c6972453" into nyc-mr1-dev-plus-aosp
...
am: 80219b3060
* commit '80219b30608859ab2cb88ea81082d6f662a1045c':
Change-Id: I0d1a702b337039e58dbc5ff01a9608e1a99acf32
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
0ac236461a
Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
am: 69f12b6e6f
...
am: eaad6d7fcc
* commit 'eaad6d7fcc4e4382db58f2c76df29af0dcdc5cda':
Change-Id: Ifecc4290f23f6035c411a94e249145d79147acf8
2016-04-21 20:25:48 +00:00
Robin Lee
02ba0a13a3
Merge "resolve merge conflicts of 04c7dc2
to master"
2016-04-21 20:16:06 +00:00
Mihai Niță
d3be403652
Merge "Settings: change the TTS text to use the current locale" into nyc-dev am: b1cdea67a5
...
am: 8225f4eeb1
* commit '8225f4eeb1bd8d5c3102d70a60ec0db9b729068d':
Change-Id: I7631bd9250506f40e292c72d17aa5b05a59885fb
2016-04-21 20:07:33 +00:00