Commit Graph

26680 Commits

Author SHA1 Message Date
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 Niță
65515931e9 Merge "Add accessibility actions to the drag-and-drop locale list" into nyc-dev 2016-04-22 14:40:44 +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
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
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
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
Maurice Lam
498ec55ba3 Merge "[Fingerprint] Update strings" into nyc-dev 2016-04-21 22:06:04 +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
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
Mihai Nita
8225f4eeb1 Merge "Settings: change the TTS text to use the current locale" into nyc-dev
am: b1cdea67a5

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

Change-Id: I3dbff4d2ab2b2cb34ab0adf765a75f0bafd33aa8
2016-04-21 20:03:15 +00:00
Mihai Nita
093817bd23 Merge "Settings: change the TTS text to use the current locale" into nyc-dev
am: b1cdea67a5

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

Change-Id: I1f7098ef1541f9ce89b2fdf2e701cd87166ba777
2016-04-21 20:03:14 +00:00
Mihai Niță
b1cdea67a5 Merge "Settings: change the TTS text to use the current locale" into nyc-dev 2016-04-21 19:55:42 +00:00
Android Build Merger (Role)
80219b3060 Merge "Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e am: 33c6972453" into nyc-mr1-dev-plus-aosp 2016-04-21 19:51:51 +00:00
Amit Mahajan
ce19d8d97f Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e
am: 33c6972453

* commit '33c69724536847fbd0272f48e359565a8772a405':
  Fix ApnSettings crash issue.

Change-Id: Ic03b9c03495c5c6999b375c8eb4c485ad9ea2cd5
2016-04-21 19:51:44 +00:00
Amit Mahajan
db6cedcfe7 Merge "Fix ApnSettings crash issue." into nyc-dev am: afdcb6a78e
am: c91589bddf

* commit 'c91589bddf7b170cca768584c0b607bf9bd3951d':
  Fix ApnSettings crash issue.

Change-Id: I0f5aee07478f05b2442d1dd8ab8c478a2da17786
2016-04-21 19:51:42 +00:00
yifan.bai
c91589bddf Merge "Fix ApnSettings crash issue." into nyc-dev
am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I00942a1d1cc6d1da14cfe31f32fd813796c20fa2
2016-04-21 19:49:29 +00:00
yifan.bai
33c6972453 Merge "Fix ApnSettings crash issue." into nyc-dev
am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I01da009772e6689a62fca6686900039ec4201fb5
2016-04-21 19:49:28 +00:00
Amit Mahajan
afdcb6a78e Merge "Fix ApnSettings crash issue." into nyc-dev 2016-04-21 19:41:13 +00:00
yifan.bai
27b908f6d1 Fix ApnSettings crash issue.
Steps:
1. Add a new APN;
2. Click 'Reset to default';
3. During reset, click the new APN;
4. Crash happened.
Solution:
Disable menu items when reseting default APN.

Bug: 28314239
Change-Id: I8df439d066e58039e9f91a9be642127eb7298159
2016-04-21 19:23:25 +00:00
Robin Lee
eaad6d7fcc Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
am: 69f12b6e6f

* commit '69f12b6e6f405ea0f8205efe11cddc5bb25c54dc':

Change-Id: Id1f0ba90111b8f233a1444d8b97e1ab7c3f6eb2d
2016-04-21 19:22:35 +00:00
Robin Lee
04c7dc2424 Merge changes Ibac27ee1,I336aeefd into nyc-dev am: e2ae135d3c
am: 4a588faeb8

* commit '4a588faeb8597fcfe49e1eac90307fb3fbdab244':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I398e1c8ee75c0cec6a569cc469996a5867d8975c
2016-04-21 19:20:05 +00:00
Robin Lee
4a588faeb8 Merge changes Ibac27ee1,I336aeefd into nyc-dev
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I5d447989c9a149314bf0fcde0e4f1f77b868f40e
2016-04-21 19:17:51 +00:00
Robin Lee
69f12b6e6f Merge changes Ibac27ee1,I336aeefd into nyc-dev
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I93ffd1d56ca9ff4d8e9c8e16fc897e2368ae1260
2016-04-21 19:17:50 +00:00
Robin Lee
e2ae135d3c Merge changes Ibac27ee1,I336aeefd into nyc-dev
* changes:
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs
2016-04-21 19:13:49 +00:00
Fan Zhang
ac42fbcfec Merge "Open Help forum in browser when click \'Forum\' button." into nyc-mr1-dev
am: dd2797d3ef

* commit 'dd2797d3eff2ab2bb0b42efba4319c6a1249a4c4':
  Open Help forum in browser when click 'Forum' button.

Change-Id: I287fe83878876329eb95a2384c5e47b3f55635bc
2016-04-21 18:48:16 +00:00
Jason Monk
c50b9ea495 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
am: 2548717d8b

* commit '2548717d8b7610081950a83d497c0236dcf2f0c8':

Change-Id: I5156a325c12f514bc680e56158d1f12402fa4fd0
2016-04-21 18:32:53 +00:00
Jason Monk
f1a78a1264 Merge "Fix summary loader lifecycle" into nyc-dev am: 1624f69ac9
am: 2424d1dc04

* commit '2424d1dc043ce0f7113bd789f2701beb8484c9b5':
  Fix summary loader lifecycle

Change-Id: Idb8e0530c02389ca097131ed95467042ebe0135c
2016-04-21 18:30:40 +00:00
Fan Zhang
dd2797d3ef Merge "Open Help forum in browser when click 'Forum' button." into nyc-mr1-dev 2016-04-21 18:28:46 +00:00