PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,607 Commits 1 Branch 0 Tags
606f1fc7cca3b61a9bdc04b6aecf56c00b74c01c
Commit Graph

27607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keith Cheung
43effe8441 Merge "Include work app in battery optimization settings" into nyc-dev 
am: 9b167a6878

* commit '9b167a6878d036ffb253687a4eb94e1e44e5fda4':
  Include work app in battery optimization settings

Change-Id: I61f2d84f5f57234a2dbb7a5ef4059b5e63fdfdda
 2016-04-21 15:38:30 +00:00
Keith Cheung
d932c41831 Merge "Include work app in battery optimization settings" into nyc-dev 
am: 9b167a6878

* commit '9b167a6878d036ffb253687a4eb94e1e44e5fda4':
  Include work app in battery optimization settings

Change-Id: I9998aecbbd7acea6222aa65c6928864b5ea4cd5f
 2016-04-21 15:38:02 +00:00
Fan Zhang
35e21cf630 Open Help forum in browser when click 'Forum' button. 
Bug: 28301478
Change-Id: I0dad851089aa3061513b65b79d8b31da9ba8767a
 2016-04-21 08:27:37 -07:00
Keith Cheung
9b167a6878 Merge "Include work app in battery optimization settings" into nyc-dev 2016-04-21 15:18:06 +00:00
Victor Chang
f2e02db61e Disable trust button when no screenlock is set 
Remove button is still allowed as it has been allowed in MNC
(Trust button is new in NYC)

Bug: 28161447
Change-Id: I8df73e1008c2e805f4d0b2ec68d8a4aa3bf75aba
 2016-04-21 16:14:09 +01:00
Jason Monk
9f1b88c30c Merge "Fix only one battery stat showing sometimes." into nyc-dev am: 7bcc48f77d 
am: ec2516dc0b

* commit 'ec2516dc0b05e5d1bac0a7b0c6252623bdcb3def':

Change-Id: I5b02178f6524942d352cbb8af5722553cf4317f6
 2016-04-21 14:27:56 +00:00
Jason Monk
763f5c4411 Merge "Fix only one battery stat showing sometimes." into nyc-dev am: 7bcc48f77d 
am: a2f7a5980e

* commit 'a2f7a5980e08c446ddf5748e4074c1c1f4e8252c':
  Fix only one battery stat showing sometimes.

Change-Id: I1613068ba88096d78a3894d19135e591f034a191
 2016-04-21 14:27:44 +00:00
Jason Monk
a2f7a5980e Merge "Fix only one battery stat showing sometimes." into nyc-dev 
am: 7bcc48f77d

* commit '7bcc48f77d1110a14e0cf984431da435ad1b47a5':
  Fix only one battery stat showing sometimes.

Change-Id: I70aac29590b8b65bd904a07f441f467cb7041930
 2016-04-21 14:26:01 +00:00
Jason Monk
ec2516dc0b Merge "Fix only one battery stat showing sometimes." into nyc-dev 
am: 7bcc48f77d

* commit '7bcc48f77d1110a14e0cf984431da435ad1b47a5':
  Fix only one battery stat showing sometimes.

Change-Id: Ie7abb1569eee61ce2eb28a73728a60695e481f6e
 2016-04-21 14:25:31 +00:00
Jason Monk
7bcc48f77d Merge "Fix only one battery stat showing sometimes." into nyc-dev 2016-04-21 14:21:41 +00:00
Jason Monk
a627844fed Fix only one battery stat showing sometimes. 
Take into account the prefs we are currently caching within the
group when counting how many prefs have been added.

Change-Id: I962acd41592c1a9366882711d3f4944bffb54d22
Fixes: 27931457
 2016-04-21 10:12:30 -04:00
Keisuke Kuroyanagi
f73450cd14 Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am: bf0e1338ec 
am: 9bbeeb708f

* commit '9bbeeb708ffd3216d851d5fce76e3b05e7a0e27b':

Change-Id: I5549fdcdc28338a9053a10e5ced279f76674b240
 2016-04-21 14:01:25 +00:00
Keisuke Kuroyanagi
2aa8800f46 Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am: bf0e1338ec 
am: 172829299a

* commit '172829299a211ee5aac2c5f417c3848a7a9d04a8':
  Fix: Spell checker cannot be re-enabled.

Change-Id: Ide8c8050138f0fa223815661cbec5f9545d7db66
 2016-04-21 14:01:14 +00:00
Keisuke Kuroyanagi
172829299a Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev 
am: bf0e1338ec

* commit 'bf0e1338ec8ba44b9f03d6c832003ebfa5593d70':
  Fix: Spell checker cannot be re-enabled.

Change-Id: I69ff82d861702714af39c51bc199560c5d124112
 2016-04-21 13:59:32 +00:00
Keisuke Kuroyanagi
9bbeeb708f Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev 
am: bf0e1338ec

* commit 'bf0e1338ec8ba44b9f03d6c832003ebfa5593d70':
  Fix: Spell checker cannot be re-enabled.

Change-Id: Idaa58d83e77dbcface0f44e8fd83105bae8653e3
 2016-04-21 13:59:03 +00:00
Keith Cheung
2db5eccee4 Include work app in battery optimization settings 
Fix: 23684151

Change-Id: If2d1a18838414122d8af57fda7138f87fd3f1e62
 2016-04-21 14:45:37 +01:00
Keisuke Kuroyanagi
bf0e1338ec Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev 2016-04-21 13:38:15 +00:00
Android Build Merger (Role)
e676f18650 Merge "Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde am: 8db5a1313f" into nyc-mr1-dev-plus-aosp 2016-04-21 12:48:47 +00:00
Julia Reynolds
08fccc5cdd Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde 
am: 8db5a1313f

* commit '8db5a1313feb404295713a1f19758bb8eaaea721':
  Don't save a rule without a name.

Change-Id: I6014fc170e8b227fba9dca41a78a7a1c260029ec
 2016-04-21 12:48:40 +00:00
Julia Reynolds
c776852e03 Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde 
am: b6dfee89f7

* commit 'b6dfee89f71b436b827506272d27218e90d54cd6':
  Don't save a rule without a name.

Change-Id: Ie6788c6b81480fdfdb228945bd4f2451bc99b78c
 2016-04-21 12:48:31 +00:00
Julia Reynolds
b6dfee89f7 Merge "Don\'t save a rule without a name." into nyc-dev 
am: 257355afde

* commit '257355afde546a408e4f47b59fff97df9d09cf9d':
  Don't save a rule without a name.

Change-Id: If2c2b8d4d97c14df6c68277fed639197535c8ba9
 2016-04-21 12:46:43 +00:00
Julia Reynolds
8db5a1313f Merge "Don\'t save a rule without a name." into nyc-dev 
am: 257355afde

* commit '257355afde546a408e4f47b59fff97df9d09cf9d':
  Don't save a rule without a name.

Change-Id: I1d05e1f66b8909a8153001b39aa98a625bc1ae75
 2016-04-21 12:46:17 +00:00
Julia Reynolds
257355afde Merge "Don't save a rule without a name." into nyc-dev 2016-04-21 12:29:30 +00:00
Robin Lee
e06d757a0c One updateSummary method called by all VPN prefs 
Having multiple methods means inevitably when new features are added to
the preferences, the right calls aren't made so information on the
screen lags between updates.

Bug: 28257641
Change-Id: I336aeefd5941ccf808dc9070427209a7d2530032
(cherry picked from commit 903843e6f9)
 2016-04-21 12:06:46 +01:00
Tony Mak
7655be05c1 New UI to hint user about strong auth 
Instead of having a separate textview, we now reuse the detail textview
to show the hint.

Fix: 28204828

Change-Id: I3eff3240bf7ecb1495fbf11a073a273a0de603ae
 2016-04-21 10:27:43 +01:00
Jim Miller
9145064fbd Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 25c0b7b 
am: 3e38542502

* commit '3e38542502745d5d987e6567554bdcbcdc76a4ac':

Change-Id: Iefb67eb541ba4ae9afe9a55dab0891bce254d27d
 2016-04-21 00:20:42 +00:00
Yohei Yukawa
696bf679dd Support IMEs that have no subtype in PhysicalKeyboardFragment. 
With a Framework-side change [1],
InputManager#{get, set}KeyboardLayoutForInputDevice() are now able to
deal with null InputMethodSubtype as a valid input.  With this CL, we no
longer filter out IMEs that do not support subtypes in
PhysicalKeyboardFragment.

 [1]: Ia013784a594ad3beaf30976d047f5ac0fa8185be

Bug: 28182650
Change-Id: I46b9c5b018f08e3eaa4614a0893db0be91652f3c
 2016-04-20 17:20:26 -07:00
Jim Miller
eb362d24a6 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 25c0b7b 
am: a2d94e9

* commit 'a2d94e9973a0e3072859d924c55c04225eaa9186':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I4b9f0eb86fafdfc430c1939d51f2d584216d3409
 2016-04-20 22:20:38 +00:00
Udam Saini
48c375991b Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1 
am: f21a205

* commit 'f21a205ff3bfcae0436b3ff05bee74d51423daa9':

Change-Id: Ib1f071930776981c3618d195ef869665d85fc710
 2016-04-20 22:20:37 +00:00
TreeHugger Robot
27e7979a82 Merge "Remove some of the unused assets" into nyc-dev am: 8b8002b 
am: e29e622

* commit 'e29e622b4e8911ed87c38e7b228eadaf9e8a947c':

Change-Id: Idb1126a34f1049e4b1cd9ee46e2641554d5b38c1
 2016-04-20 22:20:37 +00:00
Jason Monk
b372709b81 Merge "Add minimum date" into nyc-dev am: 17b554c 
am: b5c9e22

* commit 'b5c9e227771e58aab2980f738deffbcfcc4c1177':

Change-Id: I9fb218bef76d517be57c4c608e26cbc9ce55b29d
 2016-04-20 22:20:36 +00:00
Ruben Brunk
11279b12a8 Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110 
am: a72edfb

* commit 'a72edfb23d8efb0d3b1dd81f9826f9477837069d':

Change-Id: I916985ffd27a6e9b7a9a6057bb9bbc91648b60a2
 2016-04-20 22:20:35 +00:00
Sudheer Shanka
1f96302666 Merge "Fix summaries of some restricted switch preferences." into nyc-dev am: c2dae39 
am: 122b781

* commit '122b781d3a7be39a53855d60f0cc0500d5ebbb1c':

Change-Id: I2e8b1ba4abb19e70e72d73304894c8ee48a78475
 2016-04-20 22:20:34 +00:00
Sudheer Shanka
12d5de9705 Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a 
am: 5a80da4

* commit '5a80da4bd102a2f5f7f04539d8c622be2479af26':

Change-Id: I2766a5a5b526ea3c19369daf0f2751f4e543c7e6
 2016-04-20 22:20:33 +00:00
Jason Monk
08b7add260 Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc 
am: a60e5b5

* commit 'a60e5b52d8c0b800f6be86614dff3735013fd417':

Change-Id: Iba03018da665fc0eccab9ba13d6b5f4ba724719b
 2016-04-20 22:20:32 +00:00
TreeHugger Robot
03757401b3 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am: 4f5568a 
am: 3c62091

* commit '3c620915118e06b2b1e5c418429584ceaa10152f':

Change-Id: I06a5fd0cbe88d8a36fd7c13e67c23547cbd21319
 2016-04-20 22:20:31 +00:00
Jason Monk
e346e4f114 Merge "Fix sim status screen" into nyc-dev am: e9dffcd 
am: 5ea44d0

* commit '5ea44d0adde3876a69aecb1a87e4007b6bce143f':

Change-Id: I33ae907e60080094307acbbdfa99a9e36c048523
 2016-04-20 22:20:29 +00:00
Jason Monk
ea952e0aea Merge "Fix storage title clearing in multi-window" into nyc-dev am: 0bea8a9 
am: c58b6b7

* commit 'c58b6b7e1aca62e230cbf1e8e292d396b9857e08':

Change-Id: I3514b8edcf3a9a03095e726c04c70ba65f544848
 2016-04-20 22:20:27 +00:00
Jim Miller
3e38542502 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 
am: 25c0b7b

* commit '25c0b7bc4e12d6f0774695ca504118abba81ea88':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I62d0d25643df925e45e895ad40e2f3ad289a8812
 2016-04-20 21:46:04 +00:00
Udam Saini
8e9323b840 Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1 
am: be21812

* commit 'be218128276f3537d8afc1d4cced76adeb20a3d7':
  Fixes a string for tablets/devices

Change-Id: I44a894f21aa0e490b93ff700129545cf13a999bc
 2016-04-20 21:44:15 +00:00
Fan Zhang
9fc57d0eba Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev 
am: 01f1779

* commit '01f177982d1c38a9b85ddb2c22661a12081256a2':
  Display setting and support in a tab layout - DO NOT MERGE

Change-Id: I43cd0b99d98bc7bda0aa751a56a7ac8ec03f28dc
 2016-04-20 21:44:14 +00:00
TreeHugger Robot
1c7415767b Merge "Remove some of the unused assets" into nyc-dev am: 8b8002b 
am: 1a49ebc

* commit '1a49ebc1af4abee5e08d7c798c966abd931c1677':
  Remove some of the unused assets

Change-Id: Id8a0a645fabd3746e45bdcab43024141813dda92
 2016-04-20 21:44:14 +00:00
Jason Monk
efb6eb8613 Merge "Add minimum date" into nyc-dev am: 17b554c 
am: a0a1055

* commit 'a0a1055316a9d721c4439813b15af0b4c92d0e6e':
  Add minimum date

Change-Id: I82ebfc3618156b163581ef20cf960c510fadcb16
 2016-04-20 21:44:14 +00:00
Ruben Brunk
df317dba47 Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110 
am: 0db43e4

* commit '0db43e44d04854aec6c3d8902fe7a78b9047816c':
  Add settings for altering VR display behavior.

Change-Id: I8c79191c9baf60258543ea5718a647012c720c51
 2016-04-20 21:44:13 +00:00
Sudheer Shanka
a711612c35 Merge "Fix summaries of some restricted switch preferences." into nyc-dev am: c2dae39 
am: 14aa458

* commit '14aa458510294c67d2fabecb8058e76ad15ceefa':
  Fix summaries of some restricted switch preferences.

Change-Id: Idec83fbfa710c27d961d406f366285a47c8cf5a0
 2016-04-20 21:44:12 +00:00
Sudheer Shanka
391878a328 Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a 
am: c80d630

* commit 'c80d6305592052c91a86d68aede04cbd226c4d9e':
  Apply policy transparency to "Stay awake" in Development settings.

Change-Id: Id96188a427f4ff0d306e4f77e8ee600624cee8fa
 2016-04-20 21:44:10 +00:00
Jason Monk
36a3081447 Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc 
am: 040acf7

* commit '040acf7dabbcc9a5673755e86e765298d381ff1d':
  Daydream -> Screen saver

Change-Id: I5ab92bba5acb4d71118047f3fa5c04593cd8136a
 2016-04-20 21:44:08 +00:00
TreeHugger Robot
d0ff9d63fa Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am: 4f5568a 
am: 4d1954f

* commit '4d1954f71faf34f7995702cdd9fb3a5e1342841c':
  Listen to INetworkPolicyManager events and update UI accordingly.

Change-Id: I5c7b5c9d937af9da035fbef54eab75b70ef16b8a
 2016-04-20 21:44:06 +00:00
Jason Monk
bdbf6e771a Merge "Fix sim status screen" into nyc-dev am: e9dffcd 
am: 18bf2fb

* commit '18bf2fbdac097ab078cd3c2b726cc9fc971c9dd9':
  Fix sim status screen

Change-Id: I9b33ff21135b1d39938a6cbf34e013045629b429
 2016-04-20 21:44:05 +00:00
Jason Monk
6d2afc0cc3 Merge "Fix storage title clearing in multi-window" into nyc-dev am: 0bea8a9 
am: 018d99c

* commit '018d99cd288622bc4daf37b969e3340441bcb28d':
  Fix storage title clearing in multi-window

Change-Id: I0e1f19ca14989df82c65adbb0612dcc97370f27b
 2016-04-20 21:44:02 +00:00