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

27461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1a4ce9a438 Merge "Fix only one battery stat showing sometimes." into nyc-dev am: 7bcc48f77d am: ec2516dc0b 
am: 9f1b88c30c

* commit '9f1b88c30c78f19735371fff9a08a9748c30099d':

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

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

Change-Id: I68178af4d72ced2c914378f18b46a6dcdc36624e
 2016-04-21 14:30:04 +00: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
966781b295 Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am: bf0e1338ec am: 9bbeeb708f 
am: f73450cd14

* commit 'f73450cd14bf51ac96c7a9ebffb64765cd1ffca0':

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

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

Change-Id: Ie34d510218acd8046414efb37dd747067e4b082f
 2016-04-21 14:03:21 +00: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
Julia Reynolds
64fa49a026 Merge "Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde am: 8db5a1313f" into nyc-mr1-dev-plus-aosp 
am: e676f18650

* commit 'e676f18650adf64504fb56f4a1a8d2ce20caa52d':

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

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

Change-Id: I873acd02fdb3486865ca3bbe00c394447bf0d4e6
 2016-04-21 12:50:50 +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
Brian Carlstrom
59c3079ba9 Fix build by removing reference to createToastController 
Bug: 27751878
Change-Id: Ia1453021b81481984b1830224baf5fe98b11dc15
 2016-04-20 22:21:51 -07:00
Jim Miller
8b78e4b998 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 25c0b7b am: 3e38542502 
am: 9145064fbd

* commit '9145064fbda66be1402afc35087e082f778e0d1b':

Change-Id: Ib2efb0534b30f9c918e8cffb401bb66452bb276a
 2016-04-21 03:29:04 +00:00
Jim Miller
d6bcbabc32 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 25c0b7b am: a2d94e9 
am: eb362d24a6

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

Change-Id: I425f9473b8b361cb4734f575df1b66592ee70c17
 2016-04-21 03:29:04 +00:00
Udam Saini
d89cf62424 Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1 am: f21a205 
am: 48c375991b

* commit '48c375991b8ee6d859b590a8ce7feb49b035dd19':

Change-Id: I6130990585f8639a9e4b5f10e29e1948bc99861e
 2016-04-21 03:29:03 +00:00
Jason Monk
31195a0ce0 Merge "Remove some of the unused assets" into nyc-dev am: 8b8002b am: e29e622 
am: 27e7979a82

* commit '27e7979a82e6f329983211941912eba412fa9f41':

Change-Id: Ia2c0ef4262fdf7e9c828cdf3431f7abeb8621f6b
 2016-04-21 03:29:02 +00:00
Jason Monk
0ea93c4414 Merge "Add minimum date" into nyc-dev am: 17b554c am: b5c9e22 
am: b372709b81

* commit 'b372709b81f676c773f586a8e71f543d68f2baa2':

Change-Id: I09ab6506661d980aa4cafc22dab5a27238a64d3b
 2016-04-21 03:29:01 +00:00
Ruben Brunk
d962c36092 Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110 am: a72edfb 
am: 11279b12a8

* commit '11279b12a81e201531f0953cebacd77f26ea7d88':

Change-Id: I18521be099ae45e1390bf2e559b5e8bd7633fcf3
 2016-04-21 03:29:00 +00:00
Sudheer Shanka
55d50780c2 Merge "Fix summaries of some restricted switch preferences." into nyc-dev am: c2dae39 am: 122b781 
am: 1f96302666

* commit '1f963026669b22033ba8d10c7302d5501240881d':

Change-Id: Iad0f72b571274266da429d70e241c0813be17e00
 2016-04-21 03:28:58 +00:00
Sudheer Shanka
5503ee757e Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a am: 5a80da4 
am: 12d5de9705

* commit '12d5de97053ddc9e81f769e82f37286fd1d98cf3':

Change-Id: Ifa82d7990a5d19f204b0d319b3dcc76286365f04
 2016-04-21 03:28:57 +00:00
Jason Monk
cc36c11fb7 Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc am: a60e5b5 
am: 08b7add260

* commit '08b7add2607acbe41b9e5d8cde94f56bf77df140':

Change-Id: I53fd6968a3230a954910326501d883a8d1952cd7
 2016-04-21 03:27:36 +00:00
Felipe Leme
19305f08d3 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am: 4f5568a am: 3c62091 
am: 03757401b3

* commit '03757401b3206a2cd8f36cb977cac765186dcce6':

Change-Id: Ia755054ae1a4e6075ac4554490d3e285e0a7fd74
 2016-04-21 03:27:29 +00:00
Jason Monk
2c83b4ca32 Merge "Fix sim status screen" into nyc-dev am: e9dffcd am: 5ea44d0 
am: e346e4f114

* commit 'e346e4f11488547272e7eaf1133014e85108bd20':

Change-Id: I3225959fd502fe393d50fde539cbf88a8a935bb4
 2016-04-21 03:27:20 +00:00
Jason Monk
57875bfe0c Merge "Fix storage title clearing in multi-window" into nyc-dev am: 0bea8a9 am: c58b6b7 
am: ea952e0aea

* commit 'ea952e0aea9f621ee1a6983db71c41e949ae2451':

Change-Id: Iba3b192e2b88d2a031d67a421a2e620851083cf4
 2016-04-21 03:27:13 +00:00
Udam Saini
36461ab4fd Merge "Fixes a string for tablets/devices" into nyc-dev am: e0892e1 am: be21812 
am: 8e9323b840

* commit '8e9323b840b47b31ce294584789929191a578a35':
  Fixes a string for tablets/devices

Change-Id: Ifc93fc2f12ac5e0e937d7bf23196db292a767e9c
 2016-04-21 03:27:07 +00:00
Fan Zhang
82efef4659 Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev am: 01f1779 
am: 9fc57d0eba  -s ours

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

Change-Id: I0a40dd2e146d11faa6188685f3d4026e31e71ba5
 2016-04-21 03:27:03 +00:00
Jason Monk
642603419e Merge "Remove some of the unused assets" into nyc-dev am: 8b8002b am: 1a49ebc 
am: 1c7415767b

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

Change-Id: If2c3fbd8b4cb8a8514e4ca9df57f1d1dd07a45d9
 2016-04-21 03:27:00 +00:00
Jason Monk
7b3f43150b Merge "Add minimum date" into nyc-dev am: 17b554c am: a0a1055 
am: efb6eb8613

* commit 'efb6eb861389a4c6fbb70c98a74d9681003589ee':
  Add minimum date

Change-Id: Ia608435b123c9d1c1f6cc6e8a5ab2b44dcaa4e0e
 2016-04-21 03:26:57 +00:00
Ruben Brunk
af29fad670 Merge "Add settings for altering VR display behavior." into nyc-dev am: 3a3d110 am: 0db43e4 
am: df317dba47

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

Change-Id: Ib364edb27c678f2bb232fda3b7216b1ca0ac8874
 2016-04-21 03:26:55 +00:00
Sudheer Shanka
1bc6452083 Merge "Fix summaries of some restricted switch preferences." into nyc-dev am: c2dae39 am: 14aa458 
am: a711612c35

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

Change-Id: I40dfb91e4d8df6af7b4042d1ad3ecfe943790f3f
 2016-04-21 03:26:52 +00:00
Sudheer Shanka
8e22c9366b Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am: b2f161a am: c80d630 
am: 391878a328

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

Change-Id: I97857b9c7fa8c2c931eda82cea82bd3121716279
 2016-04-21 03:26:48 +00:00
Jason Monk
97f31d2942 Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc am: 040acf7 
am: 36a3081447

* commit '36a30814476c1a182c0501af7a7f3721a3b8cfde':
  Daydream -> Screen saver

Change-Id: I6823cabfd270bed0698a926ceec6e2816b00b631
 2016-04-21 03:26:43 +00:00
Felipe Leme
f4e4aebb18 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am: 4f5568a am: 4d1954f 
am: d0ff9d63fa

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

Change-Id: Ia8f93a21180642a7466190e7fae821d25659d182
 2016-04-21 03:26:39 +00:00
Jason Monk
72b9fbf0a1 Merge "Fix sim status screen" into nyc-dev am: e9dffcd am: 18bf2fb 
am: bdbf6e771a

* commit 'bdbf6e771a773a228787adaf1264655538b937b5':
  Fix sim status screen

Change-Id: Ia0a1eb92232845492be5fc25e89e7257aeaab4aa
 2016-04-21 03:26:35 +00:00