PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,222 Commits 1 Branch 0 Tags
6315a61bbf122f59e1c84eb3d451a3ae6844a33c
Commit Graph

27222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip P. Moltmann
80edf51d63 Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762 
am: 558c541

* commit '558c541f05443620b5b4a7032502b360cf44d84c':

Change-Id: If23cb8a2de630cf09f730ff9b39f2efb96743b1c
 2016-04-22 18:54:02 +00:00
Philip P. Moltmann
d60d2c25d1 Merge "Update print jobs appropriately in the print settings." into nyc-dev am: badb762 
am: 04b28dd

* commit '04b28dde9bf983bc7c0b6ee3f878d6148ad54eee':
  Update print jobs appropriately in the print settings.

Change-Id: I70ec2fd543967a906e01fc34a0f93c909fb4a906
 2016-04-22 18:49:01 +00:00
Philip P. Moltmann
04b28dde9b Merge "Update print jobs appropriately in the print settings." into nyc-dev 
am: badb762

* commit 'badb762523ae7cebf6db98f5a590f403893a7d99':
  Update print jobs appropriately in the print settings.

Change-Id: Ib1eb53c336d63543333d83fc25cfd55fac1f6bfb
 2016-04-22 18:41:29 +00:00
Philip P. Moltmann
558c541f05 Merge "Update print jobs appropriately in the print settings." into nyc-dev 
am: badb762

* commit 'badb762523ae7cebf6db98f5a590f403893a7d99':
  Update print jobs appropriately in the print settings.

Change-Id: Ie353c3ed8956fe8587de16db4e30be6a318a016b
 2016-04-22 18:41:12 +00:00
Daniel Nishi
52ee1c76de Fix a whitespace issue in ManageApplications. 
am: 9412c5a6e2

* commit '9412c5a6e24092ac5ae23e000bf1ae3c1455df11':
  Fix a whitespace issue in ManageApplications.

Change-Id: I585eaa6bde12eb70f3150c11fc0ffcee4f5909f2
 2016-04-22 17:34:44 +00:00
Philip P. Moltmann
badb762523 Merge "Update print jobs appropriately in the print settings." into nyc-dev 2016-04-22 17:32:36 +00:00
Tony Mak
f70b46872a Update string for work challenge 
Also, increase the char limit to 100.

Change-Id: I2d896a0d942767ec949bc235b16c824e0c6f80c7
Fix: 28204828
 2016-04-22 18:30:49 +01:00
Daniel Nishi
9412c5a6e2 Fix a whitespace issue in ManageApplications. 
Change-Id: I730d9737f801dfb29172e71fc5f32a310b8e0cc4
(cherry picked from commit cce1a3189a)
 2016-04-22 17:10:51 +00:00
Robin Lee
f8b622d8c7 Merge "Change VPN failure notification to dialog" into nyc-dev am: dc1e59a314 
am: 2bffd33441

* commit '2bffd3344108c98bae072a4e2702905d76bcb295':

Change-Id: I4b984e325d9b5af67637cf0de14e3af3c12351f1
 2016-04-22 16:12:00 +00:00
Jason Monk
48f7805243 Merge "Increase secondary text contrast on conditionals" into nyc-dev am: 7e61f71bcc 
am: 182abfa24f

* commit '182abfa24f44ed9242815397de2d011f0ac52d4c':

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

* commit '762f0e137c350ab5de3a663e1a20bdc790703b76':

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

* commit '700da14d84deea6c6396ee40a324d8b3c4aa6118':

Change-Id: Idd6d22440f0863fcb30663114ab07ac08a4a9303
 2016-04-22 16:11:58 +00:00
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
39ea5292a3 Merge "Increase secondary text contrast on conditionals" into nyc-dev am: 7e61f71bcc 
am: edc7f834ac

* commit 'edc7f834ac58950875313d9704c0e778a5a90095':
  Increase secondary text contrast on conditionals

Change-Id: I862b6003c6acb637020652951376d80b718c4bc4
 2016-04-22 16:11:06 +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
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