Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,191 Commits 1 Branch 0 Tags
cc041f0427b9d54c02bf0d4ec25813fd8030c2a7
Commit Graph

11730 Commits

Author SHA1 Message Date
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
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
bf0e1338ec Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev 2016-04-21 13:38:15 +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
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
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
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
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
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
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
2524686c66 resolve merge conflicts of b0c58aa to master 
Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
 2016-04-20 17:56:12 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
4f5568a8a0 Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev 2016-04-20 17:44:55 +00:00