PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,579 Commits 1 Branch 0 Tags
c776852e03ed60f9bdde2a38e39b76010247f6b0
Commit Graph

26579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
257355afde Merge "Don't save a rule without a name." into nyc-dev 2016-04-21 12:29:30 +00: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
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
Andrew Sapperstein
3c05137c23 Remove ToastController. 
am: 1d1a269

* commit '1d1a2694e93f5b9d8c6fe01a3be8737ae0034736':
  Remove ToastController.

Change-Id: I933a0091c6a16115ea112eb13f2c19592d2c0d6c
 2016-04-20 21:44:01 +00:00
Andrew Sapperstein
b0c58aa530 Merge "Create feature factory interface & initial impl." into nyc-mr1-dev 
am: 12344c5

* commit '12344c5ff5be19e9f610df033b2cdf529cd13d76':
  Create feature factory interface & initial impl.

Change-Id: I0e4cb8ae5c4ac749b38da306d870be01c1775958
 2016-04-20 21:43:58 +00:00
Jim Miller
a2d94e9973 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: I1c7df2c60f898807a3e64fa714db4ff4675835fc
 2016-04-20 21:42:23 +00:00
Udam Saini
f21a205ff3 Merge "Fixes a string for tablets/devices" into nyc-dev 
am: e0892e1

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

Change-Id: I63f0475602c2ca19053387ca7c08e6881828a22e
 2016-04-20 21:42:22 +00:00
Jason Monk
e29e622b4e Merge "Remove some of the unused assets" into nyc-dev 
am: 8b8002b

* commit '8b8002b50831e8c93df0f04e2e6605719585b985':
  Remove some of the unused assets

Change-Id: Ibcbcd933131aa12feb5b226c76a943d947c77db0
 2016-04-20 21:42:22 +00:00
Jason Monk
b5c9e22777 Merge "Add minimum date" into nyc-dev 
am: 17b554c

* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
  Add minimum date

Change-Id: I537a109c7f7d2a3ff33f2cf9a9755060b2b6b640
 2016-04-20 21:42:21 +00:00
Ruben Brunk
a72edfb23d Merge "Add settings for altering VR display behavior." into nyc-dev 
am: 3a3d110

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

Change-Id: I63640eedc5729ff34a388f2914e9c60ce7c715df
 2016-04-20 21:42:20 +00:00
Sudheer Shanka
122b781d3a Merge "Fix summaries of some restricted switch preferences." into nyc-dev 
am: c2dae39

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

Change-Id: If7fb847fb1a995d92519ec223492cee6711ec46a
 2016-04-20 21:42:20 +00:00
Sudheer Shanka
5a80da4bd1 Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev 
am: b2f161a

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

Change-Id: Ifa4602bf64c12d47030e71068c80733bf6d88bfa
 2016-04-20 21:42:19 +00:00
Jason Monk
a60e5b52d8 Merge "Daydream -> Screen saver" into nyc-dev 
am: ea80ebc

* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
  Daydream -> Screen saver

Change-Id: Ia6454ece816ef711261094fceab046563c723514
 2016-04-20 21:42:18 +00:00
Felipe Leme
3c62091511 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev 
am: 4f5568a

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

Change-Id: I2aad2e45e53b910efb6b1c684708db0c44ace65a
 2016-04-20 21:42:17 +00:00
Jason Monk
5ea44d0add Merge "Fix sim status screen" into nyc-dev 
am: e9dffcd

* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
  Fix sim status screen

Change-Id: I56392c9e5319778d31942550497929618ad3338c
 2016-04-20 21:42:16 +00:00
Jason Monk
c58b6b7e1a Merge "Fix storage title clearing in multi-window" into nyc-dev 
am: 0bea8a9

* commit '0bea8a9f48eabefbd41484ffa19ec21637150a2c':
  Fix storage title clearing in multi-window

Change-Id: Ief2ca68ee3b7563e77091db09eb455c387158b41
 2016-04-20 21:42:15 +00:00
Jim Miller
25c0b7bc4e Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 2016-04-20 21:33:13 +00:00
Jim Miller
5a8e522c6c Fix bug where fingerprint for wrong userId was attempted to be removed. 
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.

Fixes bug 28268635

Change-Id: Ic8abfbf6fbf173db2d57a76ac2e38b2a71ffd19e
 2016-04-20 14:06:00 -07:00
Udam Saini
be21812827 Merge "Fixes a string for tablets/devices" into nyc-dev 
am: e0892e1

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

Change-Id: Ia183de4fa9330a6e89bb53d2f16d5a0a8f286456
 2016-04-20 21:04:30 +00:00
Udam Saini
e0892e16ad Merge "Fixes a string for tablets/devices" into nyc-dev 2016-04-20 20:54:41 +00:00
Fan Zhang
01f177982d Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev 2016-04-20 20:50:17 +00:00
Jason Monk
1a49ebc1af Merge "Remove some of the unused assets" into nyc-dev 
am: 8b8002b

* commit '8b8002b50831e8c93df0f04e2e6605719585b985':
  Remove some of the unused assets

Change-Id: Ib957eafa08cfb05c14ee9e87e9f86d9895f606aa
 2016-04-20 20:48:42 +00:00
Jason Monk
a0a1055316 Merge "Add minimum date" into nyc-dev 
am: 17b554c

* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
  Add minimum date

Change-Id: I12809498e61faa81775d7ba97d358db779c0a14b
 2016-04-20 20:48:42 +00:00
TreeHugger Robot
8b8002b508 Merge "Remove some of the unused assets" into nyc-dev 2016-04-20 20:42:55 +00:00
Jason Monk
17b554c8b7 Merge "Add minimum date" into nyc-dev 2016-04-20 20:36:36 +00:00
Julia Reynolds
472526e53f Don't save a rule without a name. 
Bug: 28282339
Change-Id: Ie0a66f980c920354d172be4f0b91584338efce69
 2016-04-20 16:08:30 -04:00