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
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
Jim Kaye
ee00fb9c1b
Emulator: Have the Settings page say "About emulated device"
...
The Settings page for a real device says "About phone" or
"About tablet". This text is selected at build time, so the
Emulator cannot get the Sytem to choose correctly at launch time.
Our solution is to say "About emulated device" for all types
of virtual devices.
Change-Id: I7e3fc757dab529e2619d6acba54457ce8f7171e9
2016-01-11 23:40:33 +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
Sudheer Shanka
1b31df3221
am 3ad534aa: am bc956309: Update warning dialog on work profile deletion. am: f1fa3c7a3d
...
am: a390270880
2016-01-11 20:40:44 +00:00
Geoff Mendal
c73deb001e
am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE am: 392858626b -s ours
...
am: b2bf537030
2016-01-11 20:40:33 +00:00
Alan Viverette
b88ef038e0
am fb7827f3: am d4988442: Point to Material.Settings themes am: d508cd9b6f
...
am: 923938b6c9
2016-01-11 20:39:12 +00:00
Yorke Lee
6c9ea7227e
am 80848e20: am 169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev am: beed867ada
...
am: 1d942caaf9
2016-01-11 20:39:02 +00:00
Jorim Jaggi
6c4dc42b12
am 80134266: am 4a2423ba: Move fingerprint enroll logic into sidecar fragment am: 0f6400fac5
...
am: 3e7e01a23e
2016-01-11 20:38:52 +00:00
Jorim Jaggi
9d63b8fab3
am 6ecd1005: am 11eae045: Allow incremental builds for settings. am: a1bc287cc3
...
am: 340b8dcb7b
2016-01-11 20:38:42 +00:00
Maurice Lam
788ceec867
am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev am: 3cd6eabcb8
...
am: 7c63d887e0
2016-01-11 20:38:32 +00:00
Maurice Lam
ad70eeea32
am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev am: bb61d7bc66
...
am: e28f490134
2016-01-11 20:38:22 +00:00
Jason Monk
9231d87dbe
am e5f7ba7f: am 70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev am: 5e1e20237d
...
am: c87c93659d
2016-01-11 20:38:12 +00:00
Geoff Mendal
b85fda6fa7
am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import translations. DO NOT MERGE am: e2b5070c10 -s ours
...
am: 87a98ceb75
2016-01-11 20:38:02 +00:00
Geoff Mendal
d17aced04e
am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import translations. DO NOT MERGE am: 5312261de7 -s ours
...
am: 34ed83bd9d
2016-01-11 20:37:51 +00:00
Sudheer Shanka
a390270880
am 3ad534aa: am bc956309: Update warning dialog on work profile deletion.
...
am: f1fa3c7a3d
2016-01-11 20:37:49 +00:00
Geoff Mendal
b2bf537030
am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE
...
am: 392858626b
2016-01-11 20:37:37 +00:00
