Commit Graph

10755 Commits

Author SHA1 Message Date
Sudheer Shanka
cd8d052f25 Check for MANAGE_DEVICE_ADMINS permission instead of uids.
Currently, in ShowAdminSupportDetailsDialog we use uid check to
restrict only system to pass extras. Relaxing that condition to
allow any package with MANAGE_DEVICE_ADMINS permission to pass extras.

Change-Id: I0351c1f82321b2304a61b5831788806636402610
2016-01-18 20:15:40 +00:00
Mahaver Chopra
536b818133 Added work mode in Settings->Accounts
Added work mode switch preference to enable work mode from within
settings. Already implemented in quick setting tiles.

Bug: 26533692
Change-Id: I16e530e2055f92a44bb2c00a2e124813e5e824f0
2016-01-18 11:04:30 +00:00
Steve Pfetsch
b3fef371be Enable color temperature developer setting
Manual merge from mnc-dr1.5-dev.
Add a switch in Developer Settings to enable "cool" color temperature mode.

Bug: 26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
2016-01-17 01:23:44 -08:00
Udam Saini
7df06f131f Only display warning to user if we are enabling OEM
When we disable OEM unlocking through developer options, no need
to show the warning dialog.

bug:26285618
Change-Id: I476761aeb850a60f345fc2fd8cbdb4ec730cc2c9
2016-01-15 16:09:30 -08:00
Steve Pfetsch
dcd4a64f66 Enable color temperature developer setting am: ab5da2d2fe
am: 979a32e6e3

* commit '979a32e6e30d7fc12fb64ba842f66aee97cdac91':
  Enable color temperature developer setting
2016-01-15 20:44:42 +00:00
Julia Reynolds
aa92d08b1d Merge "Importance slide updates." 2016-01-15 20:21:22 +00:00
Julia Reynolds
c9a1884ed8 Importance slide updates.
- Make settings match systemui
- prevent users from blocking system notification topics, and
share said code with systemui

Bug: 26575595
Change-Id: I3911046e2f96897b26b9b9597835a8d7b771996f
2016-01-15 15:18:02 -05:00
Noah Wang
085028d7ee Add dot page indicator to preview screen pager.
Change-Id: I4fa5aba28ad20be17bd5fa8d3c6a06d8a9a4a64a
2016-01-15 10:48:04 -08:00
Noah Wang
99b7b12e19 Merge "Accomodating multiple preview screen with ViewPager for the users to swipe across, along with some UI refinements." 2016-01-15 18:30:26 +00:00
Pavel Zhamaitsiak
6bbe8ebaf2 Merge "IMS: Make wifi call settings UI non indexable" 2016-01-15 17:49:12 +00:00
Udam Saini
efce7d0074 Merge "Fixes alignment for fingerprint animation during setup." 2016-01-15 17:45:59 +00:00
Anju Mathapati
ec4706a227 IMS: Make wifi call settings UI non indexable
- Visibility of wifi calling settings option is controlled
with operator mcc/mnc values.
- Make wifi calling settings UI non indexable when UI option
is removed.

Bug: 23895298
Change-Id: Ie5bdbdde5d17582eceeee07c2d5ee9fb361e00bc
2016-01-15 09:41:54 -08:00
Julia Reynolds
15603c0b01 Merge "Obey rule instance limit." 2016-01-15 16:44:26 +00:00
Julia Reynolds
0cca0f5c02 Obey rule instance limit.
Do not show a rule type in the 'Add rule' dialog if the number of
current instances of that rule equals the max number of instances 
allowed by that rule type.

Bug: 25563007
Change-Id: I18f2598c6d92aec93c27755bb6b04c460ee294d0
2016-01-15 15:21:41 +00:00
Benjamin Franz
2043fd98a3 Merge "Resolve new intent that allows setting the parent challenge" 2016-01-15 14:04:02 +00:00
Benjamin Franz
ae07b5080a Resolve new intent that allows setting the parent challenge
Have ChooseLockGeneric resolve the new intent that allows setting the
parent challenge. If the new intent is received or seperate work
challenge is not supported, default to setting the challenge of the
parent user, otherwise use the calling user.

Change-Id: Ibd0ce8ce81b1d5c9073d4eb0096fdc74de12ee95
2016-01-15 11:38:41 +00:00
Noah Wang
49fabb9b47 Accomodating multiple preview screen with ViewPager for the users to
swipe across, along with some UI refinements.

Change-Id: I9487bcce88cdab490a4b6baa752224acddc5be52
2016-01-14 22:50:54 -08:00
Udam Saini
823cddc068 Fixes alignment for fingerprint animation during setup.
bug:26416907
Change-Id: I4da2166b5079cb97fac4547e720b042b9cbe5ac2
2016-01-14 16:30:49 -08:00
Steve Pfetsch
ab5da2d2fe Enable color temperature developer setting
Add a switch in Developer Settings to enable "cool" color temperature
mode.

Bug: 26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
2016-01-14 15:19:05 -08:00
Robin Lee
003a4b563a Show app VPNs in always-on list
Bug: 22547950
Change-Id: I1b37f3b8d2a061f9f6fba3c8b9a95f3b7edcee64
2016-01-14 17:17:52 +00:00
Jim Miller
a9c8cf7bf5 Merge "Auto-advance when fingerprint touch is detected." 2016-01-13 23:37:12 +00:00
Clara Bayarri
8b5d7ff3d6 Work Challenge Unification Settings
Change-Id: I255c5f8064e68712e78211e2e3daaae682b1966f
2016-01-13 10:27:13 +00:00
Clara Bayarri
b8a22e42d4 Update Work Challenge check to take userId
Change-Id: I239bca2dc55066c717d74487105646df22768d93
2016-01-13 10:27:13 +00:00
Clara Bayarri
8c9521f27c Fix leaking IntentReceiver in SettingsActivity
We added a new IntentReceiver to notice users being added and
removed, but missed unregistering it where appropriate.

Change-Id: I3ca1d7c8916870066dda34b830e100948dd4481c
2016-01-13 10:27:13 +00:00
Felipe Leme
08703c8bb1 Added option do display and clear URI permissions.
BUG: 26447975
Change-Id: If5269a62908ce37501219ca8dba619041812d800
2016-01-12 16:30:08 -08:00
Udam Saini
22b9e6dcdf Merge "Fixes animation video from not playing after onStop" 2016-01-12 23:19:54 +00:00
Udam Saini
8298b47f00 Fixes animation video from not playing after onStop
Adds a pause command that doesn't destroy the video surface, and calls
onStop when we want to destroy the media player.

bug:26516460
Change-Id: If46d26088e81fdca6a73a663a48901bb5245acc8
2016-01-12 14:43:43 -08:00
Pavel Zhamaitsiak
acb25a1d9a resolve merge conflicts of 5a1e5edeb7 to master.
Change-Id: Ie980796ac4f02e82d6d734e5e124fb885302e18d
2016-01-12 14:39:42 -08:00
Sudheer Shanka
5b3f206f68 Merge "Move restricted padlock support to SettingsLib" 2016-01-12 18:25:00 +00:00
Gustav Sennton
5ac14f79d0 Merge "Prompt user to enable chosen WebView provider if disabled." 2016-01-12 18:14:48 +00:00
Sudheer Shanka
661043571c Move restricted padlock support to SettingsLib
Change-Id: Ief5afa8f612f3619b6451ac7785952a84bd5100a
2016-01-12 18:11:48 +00:00
Gustav Sennton
c1d83e826e Prompt user to enable chosen WebView provider if disabled.
The WebView loading logic will not allow for the user to pick a provider
that is disabled. But in the WebView developer setting for choosing
provider disabled WebView providers are shown. Therefore if the user
wants to use a disabled provider we (with this patch) prompt them to
enable the provider (if they agree we then enable it).

Bug: 26400585

Change-Id: I42476acc54f01cf873b267dd22079c5c50fa07a2
2016-01-12 17:55:14 +00:00
Tony Mantler
bd99c43887 Merge "Move a bunch of app restrictions logic to SettingsLib" 2016-01-12 17:17:04 +00:00
Noah Wang
73b1f13756 Merge "Adding settings screen for font size. Also factored out common components from screen magnification settings screen." 2016-01-12 17:04:04 +00:00
Makoto Onuki
32ed1f997c Merge "Remove fixed TODO (Settings)" 2016-01-12 00:39:18 +00:00
Makoto Onuki
d669fee6fb Remove fixed TODO (Settings)
Change-Id: Ia4477acffb6209e5d3103367e69dbc789399cd9e
2016-01-11 15:36:52 -08:00
Sudheer Shanka
38268b37d0 Merge "Add padlock to items in overflow menus and dropdown dialogs." 2016-01-11 22:15:15 +00:00
Tony Mantler
06add5c5c3 Move a bunch of app restrictions logic to SettingsLib
Change-Id: I54106d1175ba8bff8586c8c4dcef87e51fd1483b
2016-01-11 13:39:36 -08:00
Noah Wang
e64cc267e7 Adding settings screen for font size. Also factored out common
components from screen magnification settings screen.

Change-Id: I1828c7c0246f14493903172f2da7419fdc8e5f09
2016-01-11 12:57:00 -08:00
Sungmin Choi
5a1e5edeb7 Select or not Wi-Fi Calling preference as CarrierConfig am: 577add865a
am: 6a4d214ed6

* commit '6a4d214ed6733efca5cb4217a64c4dd7b5a7e96d':
  Select or not Wi-Fi Calling preference as CarrierConfig
2016-01-11 20:33:11 +00:00
Sudheer Shanka
4bb4886fce Add padlock to items in overflow menus and dropdown dialogs.
Bug: 26378442
Change-Id: I7b21ff8e0b95f6cda9f720f979f7c475244b340d
2016-01-11 20:19:45 +00:00
Jason Monk
f0df7bcdbe Merge "Move some battery stuff to SettingsLib" 2016-01-11 19:30:24 +00:00
Sungmin Choi
577add865a Select or not Wi-Fi Calling preference as CarrierConfig
Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.

Bug: 26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
2016-01-11 11:06:41 -08:00
Clara Bayarri
6934a044b8 Work Profile Passphrase Setting
Create a new section in Security Settings which includes all
settings for the Work Challenge.
Only some settings apply to the Work Challenge, so we reuse
the security settings layouts for items and compare them against
a whitelist to remove unwanted items.

Additionally, remove all usages of ChooseLockGeneric.KEY_USER_ID
in favor of Intent.EXTRA_USER_ID.

Change-Id: I3d1ba953a2056f7c61a7b3feeb8b49f1a352dff6
2016-01-11 10:30:18 +00:00
Andy Hung
00683f9d62 Merge "Add mono audio to SoundSettings" 2016-01-08 23:17:55 +00:00
Mark Salyzyn
d23e45bfb5 Merge "whitelist "snet_event_log" when turning logs off" am: 574814a4c2
am: 836be3ff89

* commit '836be3ff89124e7ac8cf221f56de1c45b7a8c092':
  whitelist "snet_event_log" when turning logs off
2016-01-08 22:46:02 +00:00
Mark Salyzyn
836be3ff89 Merge "whitelist "snet_event_log" when turning logs off"
am: 574814a4c2

* commit '574814a4c2ac0e66cd14eb6370dba426bb6d5882':
  whitelist "snet_event_log" when turning logs off
2016-01-08 22:44:12 +00:00
Mark Salyzyn
8fc90b4fe0 whitelist "snet_event_log" when turning logs off
- Before silencing the logs, ensure security logs are whitelisted
- Only touch persist.log.tag properties if they need to be, add
  stacking to the property.
- Clear persist.logd.size property when at default setting

Bug: 26178938
Change-Id: I8fdb040062dc9cbb23d7bc3c117d96ff8550c132
2016-01-08 13:48:24 -08:00
Michael Wright
ed46e1a5fa Merge "Directly show the layout selection screen." 2016-01-08 20:55:01 +00:00
Jason Monk
27985e1f92 Move some battery stuff to SettingsLib
So that it can be used in the battery detail panel

Change-Id: I31eac974d29838726450940109b52d458f29c192
2016-01-08 14:13:05 -05:00