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

27144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Ruben Brunk
0db43e44d0 Merge "Add settings for altering VR display behavior." into nyc-dev 
am: 3a3d110

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

Change-Id: I051c2374bfc6ecaafff178e06079434958f53136
 2016-04-20 20:04:03 +00:00
Ruben Brunk
3a3d110a50 Merge "Add settings for altering VR display behavior." into nyc-dev 2016-04-20 19:51:50 +00:00
Ruben Brunk
e4d95c087b Add settings for altering VR display behavior. 
Bug=28208992

Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8
 2016-04-20 12:49:05 -07:00
Jason Monk
78f7b416c0 Add minimum date 
Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes: 26346842
 2016-04-20 15:44:21 -04:00
Jason Monk
7f4a231d89 Remove some of the unused assets 
Probably didn't get them all, but this is good enough for now.

Change-Id: I86637d7ae1e31ba9cd625589fa1e4ded32cca4b3
Fixes: 27816752
 2016-04-20 15:10:08 -04:00
Fan Zhang
2869157ba9 Display setting and support in a tab layout - DO NOT MERGE 
Bug: 28269035
Bug: 28139604
 2016-04-20 11:42:15 -07:00
Udam Saini
415fef89f3 Fixes a string for tablets/devices 
Had accidentally always set this to phone.

bug:28293197
Change-Id: I926e4c9681f2e7e660bdc2664256c8a7ea6e7951
 2016-04-20 11:27:02 -07:00
Sudheer Shanka
14aa458510 Merge "Fix summaries of some restricted switch preferences." into nyc-dev 
am: c2dae39

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

Change-Id: Ie84937b155d8c5382bbb697c3f70fccaf28b897e
 2016-04-20 18:16:26 +00:00
Sudheer Shanka
c2dae39ab4 Merge "Fix summaries of some restricted switch preferences." into nyc-dev 2016-04-20 18:04:12 +00:00
Sudheer Shanka
c80d630559 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: I22816dad3b6a96d36062f395847eec36db205363
 2016-04-20 18:02:35 +00:00
Jason Monk
040acf7dab Merge "Daydream -> Screen saver" into nyc-dev 
am: ea80ebc

* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
  Daydream -> Screen saver

Change-Id: I2536df1ef2c588a70f3820b15efda3b2fa366cae
 2016-04-20 17:56:04 +00:00