OSDN Git Service
Jim Miller [Wed, 13 Jan 2016 23:37:12 +0000 (23:37 +0000)]
Merge "Auto-advance when fingerprint touch is detected."
Geoff Mendal [Wed, 13 Jan 2016 21:58:04 +0000 (21:58 +0000)]
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
Geoff Mendal [Wed, 13 Jan 2016 14:34:34 +0000 (14:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 13 Jan 2016 14:25:23 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie42dc059be04b9a1ce406ee08aa479061bf8b62d
Auto-generated-cl: translation import
Clara Bayarri [Fri, 8 Jan 2016 16:59:27 +0000 (16:59 +0000)]
Work Challenge Unification Settings
Change-Id: I255c5f8064e68712e78211e2e3daaae682b1966f
Clara Bayarri [Fri, 18 Dec 2015 16:40:18 +0000 (16:40 +0000)]
Update Work Challenge check to take userId
Change-Id: I239bca2dc55066c717d74487105646df22768d93
Clara Bayarri [Tue, 12 Jan 2016 14:10:45 +0000 (14:10 +0000)]
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
Geoff Mendal [Wed, 13 Jan 2016 01:14:57 +0000 (01:14 +0000)]
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
Geoff Mendal [Wed, 13 Jan 2016 01:12:12 +0000 (01:12 +0000)]
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
Geoff Mendal [Wed, 13 Jan 2016 01:10:08 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours am:
21e3d54adc -s ours
am:
b994c93600 -s ours
* commit '
b994c936002bacf9d6fe314f9ebef3432a58dd6c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:07:32 +0000 (01:07 +0000)]
Import translations. DO NOT MERGE am:
6a52aca8ea -s ours
am:
21e3d54adc -s ours
* commit '
21e3d54adc473b20c2591cd348b79fe0dd43e61e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 01:05:38 +0000 (01:05 +0000)]
Import translations. DO NOT MERGE
am:
6a52aca8ea -s ours
* commit '
6a52aca8eab3bb879fa7376747f23526cb8398bc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 00:44:04 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
Felipe Leme [Fri, 8 Jan 2016 17:53:29 +0000 (09:53 -0800)]
Added option do display and clear URI permissions.
BUG:
26447975
Change-Id: If5269a62908ce37501219ca8dba619041812d800
Udam Saini [Tue, 12 Jan 2016 23:19:54 +0000 (23:19 +0000)]
Merge "Fixes animation video from not playing after onStop"
Udam Saini [Tue, 12 Jan 2016 22:43:43 +0000 (14:43 -0800)]
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
Pavel Zhamaitsiak [Tue, 12 Jan 2016 22:39:42 +0000 (14:39 -0800)]
resolve merge conflicts of
5a1e5edeb7 to master.
Change-Id: Ie980796ac4f02e82d6d734e5e124fb885302e18d
Jim Kaye [Tue, 12 Jan 2016 22:13:24 +0000 (22:13 +0000)]
Merge "Emulator: Have the Settings page say "About emulated device""
Sudheer Shanka [Tue, 12 Jan 2016 18:25:00 +0000 (18:25 +0000)]
Merge "Move restricted padlock support to SettingsLib"
Gustav Sennton [Tue, 12 Jan 2016 18:14:48 +0000 (18:14 +0000)]
Merge "Prompt user to enable chosen WebView provider if disabled."
Sudheer Shanka [Tue, 12 Jan 2016 17:43:20 +0000 (17:43 +0000)]
Move restricted padlock support to SettingsLib
Change-Id: Ief5afa8f612f3619b6451ac7785952a84bd5100a
Gustav Sennton [Thu, 7 Jan 2016 11:58:49 +0000 (11:58 +0000)]
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
Tony Mantler [Tue, 12 Jan 2016 17:17:04 +0000 (17:17 +0000)]
Merge "Move a bunch of app restrictions logic to SettingsLib"
Noah Wang [Tue, 12 Jan 2016 17:04:04 +0000 (17:04 +0000)]
Merge "Adding settings screen for font size. Also factored out common components from screen magnification settings screen."
Makoto Onuki [Tue, 12 Jan 2016 00:39:18 +0000 (00:39 +0000)]
Merge "Remove fixed TODO (Settings)"
Jim Kaye [Thu, 7 Jan 2016 22:33:29 +0000 (14:33 -0800)]
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
Makoto Onuki [Mon, 11 Jan 2016 23:36:33 +0000 (15:36 -0800)]
Remove fixed TODO (Settings)
Change-Id: Ia4477acffb6209e5d3103367e69dbc789399cd9e
Sudheer Shanka [Mon, 11 Jan 2016 22:15:15 +0000 (22:15 +0000)]
Merge "Add padlock to items in overflow menus and dropdown dialogs."
Tony Mantler [Mon, 11 Jan 2016 19:41:52 +0000 (11:41 -0800)]
Move a bunch of app restrictions logic to SettingsLib
Change-Id: I54106d1175ba8bff8586c8c4dcef87e51fd1483b
Noah Wang [Tue, 15 Dec 2015 17:05:30 +0000 (09:05 -0800)]
Adding settings screen for font size. Also factored out common
components from screen magnification settings screen.
Change-Id: I1828c7c0246f14493903172f2da7419fdc8e5f09
Sudheer Shanka [Mon, 11 Jan 2016 20:40:44 +0000 (20:40 +0000)]
am
3ad534aa: am
bc956309: Update warning dialog on work profile deletion. am:
f1fa3c7a3d
am:
a390270880
* commit '
a3902708801d56a16b4d6aedd130893e9da6ff62':
Geoff Mendal [Mon, 11 Jan 2016 20:40:33 +0000 (20:40 +0000)]
am
0baeee0c: (-s ours) am
79670bbe: (-s ours) Import translations. DO NOT MERGE am:
392858626b -s ours
am:
b2bf537030 -s ours
* commit '
b2bf53703095b2fd5eadfcd677b3dbb51a75cb17':
Alan Viverette [Mon, 11 Jan 2016 20:39:12 +0000 (20:39 +0000)]
Yorke Lee [Mon, 11 Jan 2016 20:39:02 +0000 (20:39 +0000)]
am
80848e20: am
169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev am:
beed867ada
am:
1d942caaf9
* commit '
1d942caaf9a6f52ce2a688c25edf7541a1314521':
Jorim Jaggi [Mon, 11 Jan 2016 20:38:52 +0000 (20:38 +0000)]
am
80134266: am
4a2423ba: Move fingerprint enroll logic into sidecar fragment am:
0f6400fac5
am:
3e7e01a23e
* commit '
3e7e01a23e9a17acec416b4127834a0a8915c273':
Jorim Jaggi [Mon, 11 Jan 2016 20:38:42 +0000 (20:38 +0000)]
Maurice Lam [Mon, 11 Jan 2016 20:38:32 +0000 (20:38 +0000)]
am
ab82d2fd: am
9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev am:
3cd6eabcb8
am:
7c63d887e0
* commit '
7c63d887e05ed7f9cc6096827e0c4045b819f474':
Maurice Lam [Mon, 11 Jan 2016 20:38:22 +0000 (20:38 +0000)]
am
824b09cb: am
80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev am:
bb61d7bc66
am:
e28f490134
* commit '
e28f490134b132aca7e80323bbcd8d41eac0954e':
Jason Monk [Mon, 11 Jan 2016 20:38:12 +0000 (20:38 +0000)]
am
e5f7ba7f: am
70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev am:
5e1e20237d
am:
c87c93659d
* commit '
c87c93659d517d49363dc598094d3319ff9ee409':
Geoff Mendal [Mon, 11 Jan 2016 20:38:02 +0000 (20:38 +0000)]
am
6d53b908: (-s ours) am
d1b9edab: (-s ours) Import translations. DO NOT MERGE am:
e2b5070c10 -s ours
am:
87a98ceb75 -s ours
* commit '
87a98ceb75a753796f34854bab3a0b497371f3e3':
Geoff Mendal [Mon, 11 Jan 2016 20:37:51 +0000 (20:37 +0000)]
am
3eb3af9d: (-s ours) am
c5184ff1: (-s ours) Import translations. DO NOT MERGE am:
5312261de7 -s ours
am:
34ed83bd9d -s ours
* commit '
34ed83bd9d5649f2781eff6fa759f4fa66f0a789':
Sudheer Shanka [Mon, 11 Jan 2016 20:37:49 +0000 (20:37 +0000)]
am
3ad534aa: am
bc956309: Update warning dialog on work profile deletion.
am:
f1fa3c7a3d
* commit '
f1fa3c7a3daa6642b20d1afda9ce30f996ae8866':
Geoff Mendal [Mon, 11 Jan 2016 20:37:37 +0000 (20:37 +0000)]
am
0baeee0c: (-s ours) am
79670bbe: (-s ours) Import translations. DO NOT MERGE
am:
392858626b -s ours
* commit '
392858626b0b4583a71372a9b05be94927958d2f':
Alan Viverette [Mon, 11 Jan 2016 20:37:26 +0000 (20:37 +0000)]
Yorke Lee [Mon, 11 Jan 2016 20:37:15 +0000 (20:37 +0000)]
am
80848e20: am
169f824b: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
am:
beed867ada
* commit '
beed867ada66f98c1867dbf4bdbb13d1bb0c1a81':
Jorim Jaggi [Mon, 11 Jan 2016 20:37:04 +0000 (20:37 +0000)]
am
80134266: am
4a2423ba: Move fingerprint enroll logic into sidecar fragment
am:
0f6400fac5
* commit '
0f6400fac5ba7d9956505f7035545fe082a33f26':
Jorim Jaggi [Mon, 11 Jan 2016 20:36:53 +0000 (20:36 +0000)]
am
6ecd1005: am
11eae045: Allow incremental builds for settings.
am:
a1bc287cc3
* commit '
a1bc287cc34a5d62c47f3c9768ab3d080234de7b':
Maurice Lam [Mon, 11 Jan 2016 20:36:42 +0000 (20:36 +0000)]
am
ab82d2fd: am
9fab5c1d: Merge "[LockSetup] Hide back button in notification interstitial" into mnc-dev
am:
3cd6eabcb8
* commit '
3cd6eabcb8cd0f36c861891c7c8d5bfdea6144e2':
Maurice Lam [Mon, 11 Jan 2016 20:36:30 +0000 (20:36 +0000)]
am
824b09cb: am
80ca2687: Merge "[WifiSetup] Show progress bar when scanning" into mnc-dev
am:
bb61d7bc66
* commit '
bb61d7bc6623fe9373deb75eca180399800ad4b7':
Jason Monk [Mon, 11 Jan 2016 20:36:19 +0000 (20:36 +0000)]
am
e5f7ba7f: am
70c5472f: Merge "Move process stats screen into memory screen." into mnc-dev
am:
5e1e20237d
* commit '
5e1e20237d3fbc0c1201e27bbd9fa7e21be0c430':
Geoff Mendal [Mon, 11 Jan 2016 20:36:07 +0000 (20:36 +0000)]
am
6d53b908: (-s ours) am
d1b9edab: (-s ours) Import translations. DO NOT MERGE
am:
e2b5070c10 -s ours
* commit '
e2b5070c1096e546ff1e1429732b25c1af7d16f5':
Geoff Mendal [Mon, 11 Jan 2016 20:35:53 +0000 (20:35 +0000)]
am
3eb3af9d: (-s ours) am
c5184ff1: (-s ours) Import translations. DO NOT MERGE
am:
5312261de7 -s ours
* commit '
5312261de76661827eae1915bcf4d42fa36309b0':
Sungmin Choi [Mon, 11 Jan 2016 20:33:11 +0000 (20:33 +0000)]
Select or not Wi-Fi Calling preference as CarrierConfig am:
577add865a
am:
6a4d214ed6
* commit '
6a4d214ed6733efca5cb4217a64c4dd7b5a7e96d':
Select or not Wi-Fi Calling preference as CarrierConfig
Sungmin Choi [Mon, 11 Jan 2016 20:31:22 +0000 (20:31 +0000)]
Select or not Wi-Fi Calling preference as CarrierConfig
am:
577add865a
* commit '
577add865a0ca3d225b0fdc248b099ea05984a75':
Select or not Wi-Fi Calling preference as CarrierConfig
Sudheer Shanka [Fri, 27 Nov 2015 19:40:26 +0000 (19:40 +0000)]
Add padlock to items in overflow menus and dropdown dialogs.
Bug:
26378442
Change-Id: I7b21ff8e0b95f6cda9f720f979f7c475244b340d
Jason Monk [Mon, 11 Jan 2016 19:30:24 +0000 (19:30 +0000)]
Merge "Move some battery stuff to SettingsLib"
Jeremy Klein [Mon, 11 Jan 2016 19:10:26 +0000 (19:10 +0000)]
Merge "Use the new TETHER_PRIVILEGED permission."
Sungmin Choi [Wed, 23 Dec 2015 05:24:52 +0000 (14:24 +0900)]
Select or not Wi-Fi Calling preference as CarrierConfig
Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.
Bug:
26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
Clara Bayarri [Mon, 11 Jan 2016 17:30:26 +0000 (17:30 +0000)]
Merge "Work Profile Passphrase Setting"
Geoff Mendal [Mon, 11 Jan 2016 14:29:22 +0000 (06:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8455592da52dae13925c1f3e91429d8f8bf622a0
Auto-generated-cl: translation import
Clara Bayarri [Wed, 14 Oct 2015 10:07:35 +0000 (11:07 +0100)]
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
Andy Hung [Fri, 8 Jan 2016 23:17:55 +0000 (23:17 +0000)]
Merge "Add mono audio to SoundSettings"
Philip P. Moltmann [Fri, 8 Jan 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Fix string description for print framework summary"
Philip P. Moltmann [Fri, 8 Jan 2016 23:03:01 +0000 (15:03 -0800)]
Fix string description for print framework summary
Bug:
26457511,
26461716
Change-Id: I3273bcb590b46438f46ac11fa125497c3f9d2e36
Mark Salyzyn [Fri, 8 Jan 2016 22:46:02 +0000 (22:46 +0000)]
Merge "whitelist "snet_event_log" when turning logs off" am:
574814a4c2
am:
836be3ff89
* commit '
836be3ff89124e7ac8cf221f56de1c45b7a8c092':
whitelist "snet_event_log" when turning logs off
Mark Salyzyn [Fri, 8 Jan 2016 22:44:12 +0000 (22:44 +0000)]
Merge "whitelist "snet_event_log" when turning logs off"
am:
574814a4c2
* commit '
574814a4c2ac0e66cd14eb6370dba426bb6d5882':
whitelist "snet_event_log" when turning logs off
Mark Salyzyn [Fri, 8 Jan 2016 22:41:10 +0000 (22:41 +0000)]
Merge "whitelist "snet_event_log" when turning logs off"
Mark Salyzyn [Thu, 7 Jan 2016 17:19:14 +0000 (09:19 -0800)]
whitelist "snet_event_log" when turning logs off
- Before silencing the logs, ensure security logs are whitelisted
- Only touch persist.log.tag properties if they need to be, add
stacking to the property.
- Clear persist.logd.size property when at default setting
Bug:
26178938
Change-Id: I8fdb040062dc9cbb23d7bc3c117d96ff8550c132
Michael Wright [Fri, 8 Jan 2016 20:55:01 +0000 (20:55 +0000)]
Merge "Directly show the layout selection screen."
Jason Monk [Fri, 8 Jan 2016 19:13:05 +0000 (14:13 -0500)]
Move some battery stuff to SettingsLib
So that it can be used in the battery detail panel
Change-Id: I31eac974d29838726450940109b52d458f29c192
Michal Karpinski [Fri, 8 Jan 2016 18:00:55 +0000 (18:00 +0000)]
Merge "Adjusting call to AMN#requestBugReport()"
Michal Karpinski [Tue, 5 Jan 2016 14:33:07 +0000 (14:33 +0000)]
Adjusting call to AMN#requestBugReport()
Bug:
26152603
Change-Id: I5cf66889732aaca2479f09ebacb7beb36f84ea58
Anna Galusza [Fri, 8 Jan 2016 17:30:00 +0000 (17:30 +0000)]
Merge "Add A11y SUW hub page after verifying build fix."
Jason Monk [Fri, 8 Jan 2016 14:50:17 +0000 (14:50 +0000)]
Merge "Add suggestions to settings"
Andrei Stingaceanu [Fri, 8 Jan 2016 10:25:52 +0000 (10:25 +0000)]
Merge "'Lock Screen Message' option is in enable state for 'None'."
Jim Miller [Fri, 8 Jan 2016 02:38:47 +0000 (18:38 -0800)]
Auto-advance when fingerprint touch is detected.
Because there's no way to listen to the fingerprint
sensor without enrolling or authenticating, we start a short
enrollment session to detect first press of a finger to
advance to the next stage.
Change-Id: If242ade8729f34464171cda54deab0922ad85b1d
Philip P. Moltmann [Fri, 8 Jan 2016 00:34:58 +0000 (00:34 +0000)]
Merge "Small corrections to the code that generates the print summary in the settings."
Philip P. Moltmann [Thu, 7 Jan 2016 18:09:12 +0000 (10:09 -0800)]
Small corrections to the code that generates the print summary in the settings.
- Optimize when the listener is active and rely on it to be cleaned up
automatically
- Only count print jobs that should be shown (i.e. not ones that are
already finished.)
Change-Id: Idba995f1036e736f47ca7402d493210600eae91c
Alex Klyubin [Thu, 7 Jan 2016 21:32:47 +0000 (21:32 +0000)]
Merge "[2/3] Remove unnecessary throws statement in ServiceManager" am:
3ba482971b
am:
ddbee086a6
* commit '
ddbee086a66657d2a1fa95d311178a0002991c56':
[2/3] Remove unnecessary throws statement in ServiceManager
Jason Monk [Thu, 7 Jan 2016 21:25:34 +0000 (16:25 -0500)]
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
Umair Khan [Thu, 7 Jan 2016 09:39:45 +0000 (15:09 +0530)]
[2/3] Remove unnecessary throws statement in ServiceManager
Signed-off-by: Umair Khan <omerjerk@gmail.com>
(cherry picked from commit
fee616c31af2b1ca5be1b8f0e179e27d09e36cb7)
Change-Id: I52d3078358f38061f4ec724ca0cc2a18d2cc43b1
Alex Klyubin [Thu, 7 Jan 2016 19:12:44 +0000 (19:12 +0000)]
Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
am:
3ba482971b
* commit '
3ba482971b0f1709520ba9713fb11ac4727559c4':
[2/3] Remove unnecessary throws statement in ServiceManager
Alex Klyubin [Thu, 7 Jan 2016 19:08:26 +0000 (19:08 +0000)]
Merge "[2/3] Remove unnecessary throws statement in ServiceManager"
Anna Galusza [Wed, 6 Jan 2016 21:46:12 +0000 (21:46 +0000)]
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
44be967e95e65458e3c36bdc10a2f1289ae5b54d.
Change-Id: I971806022dcd791de2d7819fa19df7801f51b673
Philip P. Moltmann [Tue, 22 Dec 2015 21:43:14 +0000 (13:43 -0800)]
Use disabled print services instead of enabled print services in print settings.
Change-Id: I32bc8a8dda86f92b180f043a98b304fe676db98c
Andrei Stingaceanu [Thu, 7 Jan 2016 16:33:16 +0000 (16:33 +0000)]
'Lock Screen Message' option is in enable state for 'None'.
Also take the 'lock screen enabled' state into account besides
the 'owner info enabled' when deciding if the lock screen message
tile should be enabled or not.
Bug:
26350729
Change-Id: Ic64a64b4757252f2bef3c385c725611de14b2798
Philip P. Moltmann [Wed, 6 Jan 2016 23:42:13 +0000 (15:42 -0800)]
Display number of print jobs as summary in settings app.
Change-Id: I4309c67fb62171c7b4f0f5fdd86454f155a3ec01
Umair Khan [Thu, 7 Jan 2016 09:39:45 +0000 (15:09 +0530)]
[2/3] Remove unnecessary throws statement in ServiceManager
Change-Id: Ifcda96d3ccb411ba23b40ee5cf222c25843d8a0e
Signed-off-by: Umair Khan <omerjerk@gmail.com>
Andy Hung [Mon, 21 Dec 2015 20:25:49 +0000 (12:25 -0800)]
Add mono audio to SoundSettings
Bug:
15283594
Bug:
22700363
Change-Id: Ic4571dee4567a94265bbcf11d08108b19687b284
Jeff Sharkey [Wed, 6 Jan 2016 22:26:15 +0000 (22:26 +0000)]
Merge "Follow PackageManager refactoring."
Jeff Sharkey [Wed, 6 Jan 2016 21:51:30 +0000 (14:51 -0700)]
Follow PackageManager refactoring.
Change-Id: Iae8b40acf6317366f0de780e367e0c21a9966477
Anna Galusza [Wed, 6 Jan 2016 21:44:59 +0000 (21:44 +0000)]
Merge "Revert to fix build breakage."
Anna Galusza [Wed, 6 Jan 2016 21:42:43 +0000 (21:42 +0000)]
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
bf95133f75246b7f70a16cff0ea1198249903e7c.
Change-Id: I4559dfdcf5c0f6eea316a190d507a3bccd195149
Anna Galusza [Wed, 6 Jan 2016 19:55:43 +0000 (19:55 +0000)]
Merge "Add A11y SUW hub page. Minor alterations of Magnification screen to be consistent wtih most recent desigs."
Kenny Guy [Wed, 6 Jan 2016 19:55:35 +0000 (19:55 +0000)]
Merge "Add support messages to device admin pages."
Mark Salyzyn [Wed, 6 Jan 2016 19:21:59 +0000 (19:21 +0000)]
Merge "Settings: switch to using ctl.start property instead of exec logcat" am:
5987a26e78
am:
e938d6e6e7
* commit '
e938d6e6e7484d082878f493bdfbbce78eb597fc':
Settings: switch to using ctl.start property instead of exec logcat
Mark Salyzyn [Wed, 6 Jan 2016 19:19:36 +0000 (19:19 +0000)]
Merge "Settings: switch to using ctl.start property instead of exec logcat"
am:
5987a26e78
* commit '
5987a26e7862c7737acb1dcabbd6db1a795347b2':
Settings: switch to using ctl.start property instead of exec logcat
Mark Salyzyn [Wed, 6 Jan 2016 19:15:15 +0000 (19:15 +0000)]
Merge "Settings: switch to using ctl.start property instead of exec logcat"
Clara Bayarri [Wed, 6 Jan 2016 18:51:04 +0000 (18:51 +0000)]
Merge "Launch existing Task when taskId is given to ConfirmDeviceCredential"
Fyodor Kupolov [Wed, 6 Jan 2016 18:33:07 +0000 (18:33 +0000)]
Merge "Added lock screen settings section"