Mahaver Chopra
c4c84604d6
Merge "Work mode conditional switch in main settings"
2016-01-19 18:20:34 +00:00
Mahaver Chopra
9c9e2aa2d8
Merge "Added work mode in Settings->Accounts"
2016-01-19 18:19:15 +00:00
Sudheer Shanka
17b9fa3e52
Merge "Add padlocks to more preferences that can be disabled by policy."
2016-01-19 17:58:27 +00:00
Maurice Lam
c84ccbfb8e
Merge "[RedactionInterstitial] Fix RTL text alignment"
2016-01-19 17:45:46 +00:00
Maurice Lam
eac385e2f4
Merge "[WifiDialog] Suppress activity transition"
2016-01-19 17:42:25 +00:00
Mahaver Chopra
d39995b7c4
Work mode conditional switch in main settings
...
Bug: 26533692
Change-Id: Ifa235bc54c2c6e904cb1cf4fab06d727cde2492a
2016-01-19 17:41:36 +00:00
Udam Saini
0db250f930
Merge "Only display warning to user if we are enabling OEM"
2016-01-19 17:24:28 +00:00
Sudheer Shanka
9c32468cd5
Add padlocks to more preferences that can be disabled by policy.
...
Change-Id: I7cc999dd1d46c20c888e0ba67053564e4d50946b
2016-01-19 16:56:58 +00:00
Geoff Mendal
703dae96e1
Import translations. DO NOT MERGE am: c123a6a923 -s ours am: 550dd6e8dc -s ours
...
am: 6a19c5cabf
2016-01-18 15:45:57 +00:00
Geoff Mendal
65457b4d46
Import translations. DO NOT MERGE am: bd620a7de1 -s ours
...
am: 12429ac8a7
2016-01-18 15:45:46 +00:00
Geoff Mendal
6a19c5cabf
Import translations. DO NOT MERGE am: c123a6a923 -s ours
...
am: 550dd6e8dc
2016-01-18 15:44:11 +00:00
Geoff Mendal
12429ac8a7
Import translations. DO NOT MERGE
...
am: bd620a7de1
2016-01-18 15:44:00 +00:00
Geoff Mendal
550dd6e8dc
Import translations. DO NOT MERGE
...
am: c123a6a923
2016-01-18 15:41:49 +00:00
Geoff Mendal
bd620a7de1
Import translations. DO NOT MERGE
...
Change-Id: I91bced80bb025ac6d6599db0a48f2332cea70520
Auto-generated-cl: translation import
2016-01-18 07:40:39 -08:00
Geoff Mendal
c123a6a923
Import translations. DO NOT MERGE
...
Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692
Auto-generated-cl: translation import
2016-01-18 07:32:09 -08:00
Geoff Mendal
45bc64afcb
Import translations. DO NOT MERGE
...
Change-Id: I0c7e933e157c9c3ccdb709f366c1f0346aa1c4ba
Auto-generated-cl: translation import
2016-01-18 06:43:01 -08: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
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
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
