Xiaohui Chen
f9ee84dba4
Clean up UserHandle.isOwner() in settings
...
Bug: 24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
2015-10-21 11:26:14 -07:00
Julia Reynolds
36d2b3faa9
Merge "Update sorting for rule types and instances."
2015-10-16 19:29:39 +00:00
Maurice Lam
80129d936b
Merge "Fix preferences v14 issues in lock screeen setup"
2015-10-16 17:44:04 +00:00
Jason Monk
c03a45fa9c
am 6d85d168
: am d2975f9d
: am d9774c9f
: am cdcba9ce
: Merge "Fix crashes in Settings" into mnc-dr-dev
...
* commit '6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2':
Fix crashes in Settings
2015-10-16 16:56:40 +00:00
Jason Monk
6d85d1686e
am d2975f9d
: am d9774c9f
: am cdcba9ce
: Merge "Fix crashes in Settings" into mnc-dr-dev
...
* commit 'd2975f9d0c12b46978c2a108961617293eeaba85':
Fix crashes in Settings
2015-10-16 16:49:38 +00:00
Jason Monk
d9774c9f5b
am cdcba9ce
: Merge "Fix crashes in Settings" into mnc-dr-dev
...
* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
Fix crashes in Settings
2015-10-16 16:41:22 +00:00
Jason Monk
cdcba9ce5f
Merge "Fix crashes in Settings" into mnc-dr-dev
2015-10-16 16:33:56 +00:00
Jeff Sharkey
1f5e53f9db
am bfee8b48
: am 31e2ce0e
: am d36edb9f
: am de005547
: Merge "Bail if activity was destroyed." into mnc-dr-dev
...
* commit 'bfee8b484f3bb4807d185526058ea463f91f1091':
Bail if activity was destroyed.
2015-10-16 16:33:53 +00:00
Jeff Sharkey
bfee8b484f
am 31e2ce0e
: am d36edb9f
: am de005547
: Merge "Bail if activity was destroyed." into mnc-dr-dev
...
* commit '31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
Bail if activity was destroyed.
2015-10-16 16:29:54 +00:00
Jeff Sharkey
d36edb9f46
am de005547
: Merge "Bail if activity was destroyed." into mnc-dr-dev
...
* commit 'de005547bae3799265fdad8f61720a82241f4b07':
Bail if activity was destroyed.
2015-10-16 16:18:41 +00:00
Jeff Sharkey
de005547ba
Merge "Bail if activity was destroyed." into mnc-dr-dev
2015-10-16 16:14:47 +00:00
Julia Reynolds
8fe6efc8e1
Update sorting for rule types and instances.
...
Bug: 22977552
Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
2015-10-16 11:43:54 -04:00
Jason Monk
562e40f66a
Fix add account screen
...
Don't use layout that didn't do anything special.
Bug: 24961118
Change-Id: I9207ee16e8c2c8325f3b4c00e423ac015170d10e
2015-10-16 10:59:02 -04:00
Jason Monk
afa3a1a0cb
Fix ManagedServiceSettings to work with Preferencev14
...
Bug: 25007000
Change-Id: I5e3a59b77001ce0e2928b35fa1b87878e22d4fbd
2015-10-16 10:52:16 -04:00
Jason Monk
77b11fa470
Fix crashes in Settings
...
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.
Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
2015-10-16 10:13:53 -04:00
Maurice Lam
bd28ceef10
Fix preferences v14 issues in lock screeen setup
...
Preferences support-v14 expects a RecyclerView, and cannot override
onCreateView to inflate custom views. This changes
SetupChooseLockGeneric to use suw_template_no_scroll and let
preference framework inflate its RecyclerView inside it.
Bug: 24929660
Change-Id: Icda0fed37b68d4cffb49da46a241185f32d7e467
2015-10-15 14:34:06 -07:00
Amit Mahajan
2ffc11c069
am 7b990298
: am f20d51f3
: am 6d042a69
: am 1704ca96
: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
...
* commit '7b990298323f0e24c87123d955cfd08717a079d3':
Change to add user_visible field to Carriers table.
2015-10-14 23:54:00 +00:00
Amit Mahajan
7b99029832
am f20d51f3
: am 6d042a69
: am 1704ca96
: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
...
* commit 'f20d51f3b02fafb6001e91de8b3d5a15e6222099':
Change to add user_visible field to Carriers table.
2015-10-14 23:49:08 +00:00
Amit Mahajan
6d042a69aa
am 1704ca96
: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
...
* commit '1704ca968d4566218f159817625f849c1dc34d96':
Change to add user_visible field to Carriers table.
2015-10-14 23:37:32 +00:00
Amit Mahajan
1704ca968d
Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
2015-10-14 23:33:01 +00:00
Jeff Sharkey
cabb62faf3
Bail if activity was destroyed.
...
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
2015-10-14 14:45:52 -07:00
Erik Kline
3acdaac1b0
am 38fc400a
: am 453d52b6
: am 51d71aa2
: am 583deb52
: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
...
* commit '38fc400ac901c8cfec0aeaf07c9d11a2f29d3ce2':
Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 18:01:50 +00:00
Erik Kline
38fc400ac9
am 453d52b6
: am 51d71aa2
: am 583deb52
: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
...
* commit '453d52b6575ebd97c7b4c962bd3a687c1c163968':
Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:55:18 +00:00
Erik Kline
51d71aa2bf
am 583deb52
: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
...
* commit '583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:42:15 +00:00
Jason Monk
783718fffe
Fix crash language & input settings
...
Bug: 24576551
Change-Id: Ifb717689c862193cf06c23de52b3fb68f910db3c
2015-10-13 16:45:49 -04:00
Jason Monk
39b467482d
Depend on support lib preferences
...
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-10-13 10:12:20 -04:00
Lorenzo Colitti
c311c94af5
Unconfigure the lockdown VPN if the user forgets its profile.
...
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.
Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.
Bug: 23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
2015-10-13 15:23:38 +09:00
Tony Mantler
551659e94a
Merge "Move DreamBackend to SettingsLib"
2015-10-12 15:56:52 +00:00
Christopher Tate
02858cc0c6
resolved conflicts for 192248cc
to master
...
Change-Id: I636e9c78445c3bbd8b290ec0601a45d68b36a06d
2015-10-09 17:49:13 -07:00
Christopher Tate
192248cc9a
am eba9ff7c
: am 78f7fa0f
: am 90de3beb
: Disable app-link preferences for browser apps
...
* commit 'eba9ff7c64767ba903a424adf6c74844317908cb':
Disable app-link preferences for browser apps
2015-10-10 00:14:12 +00:00
Christopher Tate
78f7fa0fc8
am 90de3beb
: Disable app-link preferences for browser apps
...
* commit '90de3bebf432d0897607adaca281fe248cd6575f':
Disable app-link preferences for browser apps
2015-10-09 23:57:48 +00:00
Christopher Tate
90de3bebf4
Disable app-link preferences for browser apps
...
Also make sure that the 'Clear defaults' action unsets the app's
standing as the default browser, when applicable.
Bug 23751034
Change-Id: I6131b763bfa76ba38d18cad2abbb35caffe789aa
2015-10-09 16:02:00 -07:00
Tony Mantler
bff7116ff0
Move DreamBackend to SettingsLib
...
Change-Id: Ia3f3f68e7182c74f4db6e00635fa0c928032a8fc
2015-10-09 14:37:16 -07:00
Julia Reynolds
3ef3ad6b73
Merge "Use id-based zen rule APIs."
2015-10-08 22:27:01 +00:00
Amit Mahajan
5787be339f
Change to add user_visible field to Carriers table.
...
Also adding config to control if adding APNs is allowed.
Bug: 24519879
Bug: 24681288
Change-Id: I59466f5489606162a10e883ede378e575a189fb3
2015-10-08 10:36:03 -07:00
Julia Reynolds
25cb8f0691
Use id-based zen rule APIs.
...
Also names no longer have to be unique.
Bug: 22977552
Change-Id: I8dbee85c15d12d5380345447047a0d49c903522e
2015-10-08 13:07:07 -04:00
Toni Barzic
496f099752
Merge "Add a11y setting for Automatically click after pointer stops"
2015-10-07 18:25:09 +00:00
Wale Ogunwale
b4d7efbfa2
Revert "Added Developer Options settings for multi-window mode."
...
This reverts commit 4c9d667bc2
.
Bug: 24462906
Bug: 19494313
Change-Id: Iaa698868d8896a09c377b5da03c20b2a0b72d253
2015-10-07 09:24:23 -07:00
Wale Ogunwale
4472dc4b6a
Revert "Remove multi-window developer setting from search index if disabled."
...
This reverts commit 77dab4be64
.
Bug: 24462906
Bug: 19494313
2015-10-06 22:26:23 +00:00
Toni Barzic
76be5e352a
Add a11y setting for Automatically click after pointer stops
...
Adds new preference screen for the feature, where the feature can be
enabled/disabled, and delay before click can be specified (implemented
as seek bar preference, enabled iff the feature is enabled).
Preference is added to Accessibility setting. The preference summary is
set to string describing the delay after pointer stops moving before
click is scheduled (the string also contains numerical value of the
delay).
BUG=20049245
Change-Id: Ib7b2f5c24efbd08e3200143c069bcdbc9b5a327a
2015-10-05 14:19:04 -07:00
Maurice Lam
ef9d636376
Merge "[WifiSettings] Add Wi-Fi dialog activity"
2015-10-01 17:24:52 +00:00
Julia Reynolds
239986eec9
Merge "Update zen rule type selection and view."
2015-10-01 12:36:14 +00:00
Zach Kuznia
c39dc017a7
am ff66f8b5
: am 24cb6374
: am a8f3f067
: am ae8aea76
: Merge "Allow manual to be read from disk" into mnc-dr-dev
...
* commit 'ff66f8b5f11248a9dfb66ef23d2c6a5be4847fdb':
Allow manual to be read from disk
2015-10-01 00:34:22 +00:00
Zach Kuznia
ff66f8b5f1
am 24cb6374
: am a8f3f067
: am ae8aea76
: Merge "Allow manual to be read from disk" into mnc-dr-dev
...
* commit '24cb6374df50a6ea5978fb9851e4030ac9924307':
Allow manual to be read from disk
2015-10-01 00:28:33 +00:00
Zach Kuznia
a8f3f067b6
am ae8aea76
: Merge "Allow manual to be read from disk" into mnc-dr-dev
...
* commit 'ae8aea76e5cbef1eefde401f8622d05275156cf7':
Allow manual to be read from disk
2015-10-01 00:15:52 +00:00
Zach Kuznia
ae8aea76e5
Merge "Allow manual to be read from disk" into mnc-dr-dev
2015-10-01 00:08:05 +00:00
Maurice Lam
e618babe5a
Merge "Remove outdated setup wizard widgets"
2015-09-30 20:41:15 +00:00
Julia Reynolds
f7748e4ae1
Update zen rule type selection and view.
...
Separate rule type selection from naming, launch 3P UI for non-system rules.
Bug: 22977552
Change-Id: Ifbd82da2192c4aaf5f239a188a016d9e1af542d6
2015-09-30 16:00:19 -04:00
Julia Reynolds
7d8a9aead5
Use public APIs for modifying automatic zen rules.
...
Bug: 22977552
Change-Id: I544f1462ad77cdeb33ccff3c9de11ea37df5505d
2015-09-30 08:57:47 -04:00
Maurice Lam
1556f3c371
Merge "[Settings] Remove dependency from SUW nav bar"
2015-09-29 17:02:43 +00:00