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
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
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
Felipe Leme
4d1954f71f 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: Iba51d696311d4ddafb34b0e21341ad63239ab89d
 2016-04-20 17:56:04 +00:00
Sudheer Shanka
b2f161ab38 Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev 2016-04-20 17:50:32 +00:00
Jason Monk
ea80ebcd92 Merge "Daydream -> Screen saver" into nyc-dev 2016-04-20 17:49:02 +00:00
TreeHugger Robot
4f5568a8a0 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev 2016-04-20 17:44:55 +00:00
Jason Monk
1ecc1f69b8 Daydream -> Screen saver 
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243
 2016-04-20 13:39:18 -04:00
Jason Monk
18bf2fbdac Merge "Fix sim status screen" into nyc-dev 
am: e9dffcd

* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
  Fix sim status screen

Change-Id: Iba80d84350dbff891e3069b04e5f585b10f50491
 2016-04-20 17:32:39 +00:00
Jason Monk
e9dffcd34d Merge "Fix sim status screen" into nyc-dev 2016-04-20 17:24:24 +00:00
Jason Monk
13d1c384e8 Fix sim status screen 
Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes: 27963774
 2016-04-20 13:22:36 -04:00
Jason Monk
018d99cd28 Merge "Fix storage title clearing in multi-window" into nyc-dev 
am: 0bea8a9

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

Change-Id: Ic0063a2c0c4b705001ec9de42dc9054794e0d6f4
 2016-04-20 17:19:11 +00:00
Jason Monk
0bea8a9f48 Merge "Fix storage title clearing in multi-window" into nyc-dev 2016-04-20 17:08:29 +00:00
Jason Monk
f3446f98d5 Fix storage title clearing in multi-window 
By accurately tracking detached state.

Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes: 27989238
 2016-04-20 13:05:45 -04:00
Andrew Sapperstein
1d1a2694e9 Remove ToastController. 
Wasn't meant to be submitted.

Change-Id: Icc94daaf47ed85cefb59f20928241ef38d5ee2ca
(cherry picked from commit 17047d1939)
 2016-04-20 16:54:13 +00:00
Andrew Sapperstein
12344c5ff5 Merge "Create feature factory interface & initial impl." into nyc-mr1-dev 2016-04-20 16:53:02 +00:00
Felipe Leme
85c63f348f Listen to INetworkPolicyManager events and update UI accordingly. 
BUG: 27481520

Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5
 2016-04-20 09:17:14 -07:00
Clara Bayarri
b4d55a2050 Remove Secure Startup option from Security Settings 
Bug: 27440560
Change-Id: Iff700e4e759aea88f8e71f1fdff1837962f84a92
 2016-04-20 15:02:44 +01:00
Android Build Merger (Role)
b876efea97 Merge "Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 3f53bdb" into nyc-mr1-dev-plus-aosp 2016-04-20 14:02:25 +00:00