PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,860 Commits 1 Branch 0 Tags
c043de9fbf509dfe9fdfd750e812bfd30ff2cb2c
Commit Graph

24860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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  -s ours

* commit '6cbc7e4f85a17c49d787025fbd73c7ebe3b0385b':
  Settings Hooks launch wrong activity
 2016-01-15 14:31:40 +00:00
Jason Monk
6cbc7e4f85 Merge "Settings Hooks launch wrong activity" 
am: 69704608f4

* commit '69704608f4801a1362a28b37962f560d834da3da':
  Settings Hooks launch wrong activity
 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

* commit '9f6cb40ebc8bcd12409bb73b8310420b89d43a83':
  Add strings for color temperature developer option
 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

* commit '0c38aca074d0e069eb214abc91eeb024b5121b73':
  Add strings for color temperature developer option
 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  -s ours

* commit 'ee38f84a66626d25d3854991f13c22585629ad7e':
  Import translations. DO NOT MERGE
 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  -s ours

* commit 'b8d0b5323b2e01a36e242a74829670d2f3e6ae7f':
  Import translations. DO NOT MERGE
 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  -s ours

* commit '0fc4bed5503136cbd8bd474c33901a2ce9a98eae':
  Import translations. DO NOT MERGE
 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  -s ours

* commit 'b994c936002bacf9d6fe314f9ebef3432a58dd6c':
  Import translations. DO NOT MERGE
 2016-01-13 01:10:08 +00:00
Geoff Mendal
b994c93600 Import translations. DO NOT MERGE am: 6a52aca8ea -s ours 
am: 21e3d54adc  -s ours

* commit '21e3d54adc473b20c2591cd348b79fe0dd43e61e':
  Import translations. DO NOT MERGE
 2016-01-13 01:07:32 +00:00
Geoff Mendal
21e3d54adc Import translations. DO NOT MERGE 
am: 6a52aca8ea  -s ours

* commit '6a52aca8eab3bb879fa7376747f23526cb8398bc':
  Import translations. DO NOT MERGE
 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