Stephen Li
8440469960
Merge -s ours commit 'dcd4a64f66'
2016-01-15 15:53:35 -08:00
Steve Pfetsch
dcd4a64f66
Enable color temperature developer setting am: ab5da2d2fe
...
am: 979a32e6e3
2016-01-15 20:44:42 +00:00
Steve Pfetsch
979a32e6e3
Enable color temperature developer setting
...
am: ab5da2d2fe
2016-01-15 20:42:18 +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
Jason Monk
28abc772a1
Merge "Settings Hooks launch wrong activity" am: 69704608f4
...
am: 6cbc7e4f85
2016-01-15 14:31:40 +00:00
Jason Monk
6cbc7e4f85
Merge "Settings Hooks launch wrong activity"
...
am: 69704608f4
2016-01-15 14:11:09 +00:00
Jason Monk
69704608f4
Merge "Settings Hooks launch wrong activity"
2016-01-15 14:07:27 +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
Henrik Baard
3436f3a88e
Settings Hooks launch wrong activity
...
The Operator and Manufacturer Hooks are broken, when
clicked they will launch WirelessSettings instead of
the activity intended to be launched.
The hook tile specifies a fragment which will be launched
when clicked. By removing this the tile will work as
intended.
Change-Id: I42d53698340cda676f4bab71857cc049d007803c
2016-01-15 11:46:32 +01: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
4ccc2c3537
Merge "Show app VPNs in always-on list"
2016-01-14 17:53:50 +00:00
Noah Wang
918eb33ad2
Merge "Modifying sample preview text for font size setting."
2016-01-14 17:48:26 +00:00
Robin Lee
003a4b563a
Show app VPNs in always-on list
...
Bug: 22547950
Change-Id: I1b37f3b8d2a061f9f6fba3c8b9a95f3b7edcee64
2016-01-14 17:17:52 +00:00
Bart Sears
8e7c979bad
resolve merge conflicts of 7e0586b7a6 to master.
...
Change-Id: I73b3e010249ac7380677cb2e635f4c847a8446c4
2016-01-13 21:39:37 -08:00
Noah Wang
954655a7f7
Modifying sample preview text for font size setting.
...
Change-Id: I4bbf1d0d81496de8e9c70a425db2aa503e5b76e0
2016-01-13 20:02:54 -08:00
Justin Harrison
7e0586b7a6
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev am: 0c38aca074
...
am: 9f6cb40ebc
2016-01-14 02:08:36 +00:00
Justin Harrison
9f6cb40ebc
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
...
am: 0c38aca074
2016-01-14 02:04:47 +00:00
Justin Harrison
0c38aca074
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
2016-01-14 01:56:42 +00:00
Steve Pfetsch
63e40965bb
Add strings for color temperature developer option
...
Introducing en-US strings for color temperature settings ahead of code
changes.
Bug: 26110238
Change-Id: I5a12aa35a730d93daa6383f7dde7d3c90db1d74b
2016-01-13 15:59:43 -08:00
Jim Miller
a9c8cf7bf5
Merge "Auto-advance when fingerprint touch is detected."
2016-01-13 23:37:12 +00:00
Geoff Mendal
09aee082d4
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ours am: b994c93600 -s ours am: 0fc4bed550 -s ours am: b8d0b5323b -s ours
...
am: ee38f84a66
2016-01-13 21:58:04 +00:00
Geoff Mendal
e2edbb1178
Merge "Import translations. DO NOT MERGE"
2016-01-13 14:34:34 +00:00
Geoff Mendal
18a8544b46
Import translations. DO NOT MERGE
...
Change-Id: Ie42dc059be04b9a1ce406ee08aa479061bf8b62d
Auto-generated-cl: translation import
2016-01-13 06:25:23 -08: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
Geoff Mendal
ee38f84a66
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ours am: b994c93600 -s ours am: 0fc4bed550 -s ours
...
am: b8d0b5323b
2016-01-13 01:14:57 +00:00
Geoff Mendal
b8d0b5323b
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ours am: b994c93600 -s ours
...
am: 0fc4bed550
2016-01-13 01:12:12 +00:00
Geoff Mendal
0fc4bed550
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ours
...
am: b994c93600
2016-01-13 01:10:08 +00:00
Geoff Mendal
b994c93600
Import translations. DO NOT MERGE am: 6a52aca8ea -s ours
...
am: 21e3d54adc
2016-01-13 01:07:32 +00:00
Geoff Mendal
21e3d54adc
Import translations. DO NOT MERGE
...
am: 6a52aca8ea
2016-01-13 01:05:38 +00:00
Geoff Mendal
6a52aca8ea
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
2016-01-12 16:44:04 -08: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
Jim Kaye
a539a57002
Merge "Emulator: Have the Settings page say "About emulated device""
2016-01-12 22:13:24 +00: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
