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
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
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
Felipe Leme
08703c8bb1
Added option do display and clear URI permissions.
...
BUG: 26447975
Change-Id: If5269a62908ce37501219ca8dba619041812d800
2016-01-12 16:30:08 -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
Sudheer Shanka
661043571c
Move restricted padlock support to SettingsLib
...
Change-Id: Ief5afa8f612f3619b6451ac7785952a84bd5100a
2016-01-12 18:11:48 +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
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
Sudheer Shanka
38268b37d0
Merge "Add padlock to items in overflow menus and dropdown dialogs."
2016-01-11 22:15:15 +00: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
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
Clara Bayarri
13c52fa850
Merge "Work Profile Passphrase Setting"
2016-01-11 17:30:26 +00:00
Geoff Mendal
74a350aced
Import translations. DO NOT MERGE
...
Change-Id: I8455592da52dae13925c1f3e91429d8f8bf622a0
Auto-generated-cl: translation import
2016-01-11 06:29:22 -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
Philip P. Moltmann
268f75e2f5
Fix string description for print framework summary
...
Bug: 26457511, 26461716
Change-Id: I3273bcb590b46438f46ac11fa125497c3f9d2e36
2016-01-08 15:03:01 -08: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
Anna Galusza
ffce406d6d
Merge "Add A11y SUW hub page after verifying build fix."
2016-01-08 17:30:00 +00:00
Jason Monk
480c5ac083
Merge "Add suggestions to settings"
2016-01-08 14:50:17 +00:00
Jason Monk
d4f03ec86f
Add suggestions to settings
...
Use an XML to define the categories that Settings will look for,
and surface enabled activities under those categories as suggestions.
When clicked on the activity will be started for result. If the result
is not cancelled, then the operation is assumed successful and the
suggestion is disabled. Users can also use an overflow -> remove
flow to get rid of unwanted suggestions.
Change-Id: I767abf8efe103af0509bc6b6b55888ae82643512
2016-01-07 16:25:34 -05:00
Anna Galusza
6bc8144e97
Add A11y SUW hub page after verifying build fix.
...
Original CL:
https://googleplex-android-review.git.corp.google.com/#/c/828444/ .
Diff (fixes build and adds a period):
https://googleplex-android-review.git.corp.google.com/#/c/841247/
This reverts commit 44be967e95
.
Change-Id: I971806022dcd791de2d7819fa19df7801f51b673
2016-01-07 17:45:31 +00:00
Philip P. Moltmann
738e6db7b8
Display number of print jobs as summary in settings app.
...
Change-Id: I4309c67fb62171c7b4f0f5fdd86454f155a3ec01
2016-01-07 08:28:18 -08:00
Andy Hung
0863ea40cd
Add mono audio to SoundSettings
...
Bug: 15283594
Bug: 22700363
Change-Id: Ic4571dee4567a94265bbcf11d08108b19687b284
2016-01-06 16:01:19 -08:00
Anna Galusza
7e78bedb67
Merge "Revert to fix build breakage."
2016-01-06 21:44:59 +00:00
Anna Galusza
44be967e95
Revert to fix build breakage.
...
Revert "Add A11y SUW hub page. Minor alterations of Magnification screen to be consistent wtih most recent desigs."
This reverts commit bf95133f75
.
Change-Id: I4559dfdcf5c0f6eea316a190d507a3bccd195149
2016-01-06 21:42:43 +00:00
Anna Galusza
c4f8dfe449
Merge "Add A11y SUW hub page. Minor alterations of Magnification screen to be consistent wtih most recent desigs."
2016-01-06 19:55:43 +00:00
Kenny Guy
e526cf20bb
Merge "Add support messages to device admin pages."
2016-01-06 19:55:35 +00:00
Fyodor Kupolov
4e348fd79a
Merge "Added lock screen settings section"
2016-01-06 18:33:07 +00:00
Kenny Guy
7a3555961d
Add support messages to device admin pages.
...
Add support message to device admin settings pages.
Show policy information for device owners
and profile owners.
Allow a user to remove profile from profile owners
admin page.
Bug: 26416662
Change-Id: I95424da50067b7c0ba1618a083a31448d406188f
2016-01-06 17:21:45 +00:00
Geoff Mendal
acd0d1e9ff
Import translations. DO NOT MERGE
...
Change-Id: I4903c2ca744d9ff3a955471ca92ff3b8eaa9f732
Auto-generated-cl: translation import
2016-01-06 06:26:38 -08:00
Fyodor Kupolov
8ba52d62ed
Added lock screen settings section
...
Added lock screen settings section and moved "Add users when device is locked"
from the overflow menu to the new section.
Bug: 25289622
Change-Id: I97c02acbacae3b6cde44180a23ea337853b0a551
2016-01-05 14:30:03 -08:00
Julia Reynolds
a1049aea99
Merge "DND Visual interruptions: don't turn screen on."
2016-01-05 20:58:23 +00:00
Filip Gruszczynski
4d621ec69d
Add missing development preference for enabling freeform.
...
Change-Id: I77d9621f76f96ba547370e5fedfed250f9dcf3d1
2016-01-05 12:18:16 -08:00
Geoff Mendal
949499948a
Merge "Import translations. DO NOT MERGE"
2016-01-05 16:17:50 +00:00
Jeff Sharkey
dbb919b8b1
Merge "Some text are missing in eject sdcard warning" am: 24eaa7ed2b
...
am: c088ea23eb
* commit 'c088ea23eb0231d49c151e71807fccc5099501c8':
Some text are missing in eject sdcard warning
2016-01-05 16:16:59 +00:00
Jeff Sharkey
c088ea23eb
Merge "Some text are missing in eject sdcard warning"
...
am: 24eaa7ed2b
* commit '24eaa7ed2b2a709fd5ad2b45ad92de6e617e126a':
Some text are missing in eject sdcard warning
2016-01-05 16:15:13 +00:00
Jeff Sharkey
24eaa7ed2b
Merge "Some text are missing in eject sdcard warning"
2016-01-05 16:11:14 +00:00
Geoff Mendal
7a8e8880b8
Import translations. DO NOT MERGE
...
Change-Id: I9ed660e4a0cb209ff3a19943b4f294fcfde307b1
Auto-generated-cl: translation import
2016-01-05 07:56:37 -08:00
Julia Reynolds
58e3eb7266
DND Visual interruptions: don't turn screen on.
...
Change-Id: I15b66918e53e733c779cf8f79d12e03a213fb26d
2016-01-05 10:31:13 -05:00
Nathan Harold
d8cf66ef73
Merge "Fix Resource Reference to radio_info_ping_hostname"
2016-01-04 23:55:59 +00:00
Nathan Harold
12e6856c61
Fix Resource Reference to radio_info_ping_hostname
...
Bug: 26386182
Change-Id: If1204ab9e2c255995c418babed2096dc9c815345
2016-01-04 15:27:32 -08:00
Julia Reynolds
2e1e0b7ef6
Allow users to choose a notification assistant.
...
Change-Id: Iddfbfedbb6a3aae246058ff41324dc06852484cb
2016-01-04 16:36:56 -05:00
Mark Salyzyn
87a3c6fee7
resolve merge conflicts of 94ab88228e
to master.
...
NB: packages/apps/Settings/res/values/arrays.xml new content
moves to frameworks/base/packages/SettingsLib/res/values/arrays.xml.
Bug: 26178938
Change-Id: Ib241baac7807914447d84b921994440bf627df29
2015-12-28 11:20:58 -08:00
Mark Salyzyn
94ab88228e
resolve merge conflicts of f3cc23524f
to mnc-dr2-dev-plus-aosp.
...
Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00
2015-12-28 10:49:04 -08:00
Mark Salyzyn
285afa8d15
Settings: Add option to disable logging
...
Bug: 26178938
Change-Id: I64263595705ceb1e6816e3cdfa982929877ff5b2
2015-12-22 15:14:56 -08:00
Philip P. Moltmann
66626910b3
Merge "Use new getIcon and getMoreInfo api to show more information in Print Settings"
2015-12-22 21:49:29 +00:00