PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,101 Commits 1 Branch 0 Tags
262148ecbd004c07556e13e143c66b51b679b332
Commit Graph

28101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mihai Niță
eb824e930f 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 
am: b89a701493

* commit 'b89a7014930f7fac6770ba6ba0d54d48535c0a2a':

Change-Id: Ie525521507d8349ade75cdc62ce0d87f8059cc92
 2016-04-22 14:54:39 +00:00
Mihai Niță
c792d935b3 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 
am: 71edd846e5

* commit '71edd846e5ef83e98d8acb10069e2758a94ede4a':

Change-Id: I74d0c5338b9b18cbdc33833f1b96f7d940ba35a1
 2016-04-22 14:54:38 +00: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
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
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