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

27194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jason Monk
9b8d070f42 Merge "Fix storage title clearing in multi-window" into nyc-dev am: 0bea8a9 am: 018d99c 
am: 6d2afc0cc3

* commit '6d2afc0cc3f7e6cf5936cef69a5eb88e2503d2bf':
  Fix storage title clearing in multi-window

Change-Id: I27502e83f1fc2d5adf5a165bf398d7b35031773f
 2016-04-21 03:26:30 +00:00
Andrew Sapperstein
ffced3af7f Remove ToastController. am: 1d1a269 
am: 3c05137c23  -s ours

* commit '3c05137c23bd2ebb61c7e9cd933b7d89d70f8905':
  Remove ToastController.

Change-Id: Ib835fb1f802ac67e40850c14b929d0846be2cf99
 2016-04-21 03:25:56 +00:00
Andrew Sapperstein
2524686c66 resolve merge conflicts of b0c58aa to master 
Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
 2016-04-20 17:56:12 -07: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
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