OSDN Git Service
Mahaver Chopra [Tue, 19 Jan 2016 18:20:34 +0000 (18:20 +0000)]
Merge "Work mode conditional switch in main settings"
Mahaver Chopra [Tue, 19 Jan 2016 18:19:15 +0000 (18:19 +0000)]
Merge "Added work mode in Settings->Accounts"
Sudheer Shanka [Tue, 19 Jan 2016 17:58:27 +0000 (17:58 +0000)]
Merge "Add padlocks to more preferences that can be disabled by policy."
Maurice Lam [Tue, 19 Jan 2016 17:45:46 +0000 (17:45 +0000)]
Merge "[RedactionInterstitial] Fix RTL text alignment"
Maurice Lam [Tue, 19 Jan 2016 17:42:25 +0000 (17:42 +0000)]
Merge "[WifiDialog] Suppress activity transition"
Mahaver Chopra [Wed, 13 Jan 2016 18:51:10 +0000 (18:51 +0000)]
Work mode conditional switch in main settings
Bug:
26533692
Change-Id: Ifa235bc54c2c6e904cb1cf4fab06d727cde2492a
Udam Saini [Tue, 19 Jan 2016 17:24:28 +0000 (17:24 +0000)]
Merge "Only display warning to user if we are enabling OEM"
Sudheer Shanka [Mon, 18 Jan 2016 11:17:23 +0000 (11:17 +0000)]
Add padlocks to more preferences that can be disabled by policy.
Change-Id: I7cc999dd1d46c20c888e0ba67053564e4d50946b
Geoff Mendal [Mon, 18 Jan 2016 15:45:57 +0000 (15:45 +0000)]
Import translations. DO NOT MERGE am:
c123a6a923 -s ours am:
550dd6e8dc -s ours
am:
6a19c5cabf -s ours
* commit '
6a19c5cabf1615ffce654a1203554bbaa1d1f72e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:45:46 +0000 (15:45 +0000)]
Import translations. DO NOT MERGE am:
bd620a7de1 -s ours
am:
12429ac8a7 -s ours
* commit '
12429ac8a7f14a349f5f8e278acd3a3cba568438':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:44:11 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE am:
c123a6a923 -s ours
am:
550dd6e8dc -s ours
* commit '
550dd6e8dceaaf2fbb2ed7a24e221c24cd72ee7d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:44:00 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE
am:
bd620a7de1 -s ours
* commit '
bd620a7de1b171ac54ce1268e12d1757c0baa86d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:41:49 +0000 (15:41 +0000)]
Import translations. DO NOT MERGE
am:
c123a6a923 -s ours
* commit '
c123a6a9230faf4800df67085b98bcd7badf4ca8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 18 Jan 2016 15:40:39 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91bced80bb025ac6d6599db0a48f2332cea70520
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 15:32:09 +0000 (07:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692
Auto-generated-cl: translation import
Geoff Mendal [Mon, 18 Jan 2016 14:43:01 +0000 (06:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c7e933e157c9c3ccdb709f366c1f0346aa1c4ba
Auto-generated-cl: translation import
Mahaver Chopra [Wed, 13 Jan 2016 12:33:23 +0000 (12:33 +0000)]
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
Udam Saini [Fri, 15 Jan 2016 02:13:22 +0000 (18:13 -0800)]
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
Stephen Li [Fri, 15 Jan 2016 23:53:35 +0000 (15:53 -0800)]
Merge -s ours commit '
dcd4a64f66'
Steve Pfetsch [Fri, 15 Jan 2016 20:44:42 +0000 (20:44 +0000)]
Enable color temperature developer setting am:
ab5da2d2fe
am:
979a32e6e3
* commit '
979a32e6e30d7fc12fb64ba842f66aee97cdac91':
Enable color temperature developer setting
Steve Pfetsch [Fri, 15 Jan 2016 20:42:18 +0000 (20:42 +0000)]
Enable color temperature developer setting
am:
ab5da2d2fe
* commit '
ab5da2d2fe0b02a7cdf5f4d78d24583b2542d213':
Enable color temperature developer setting
Julia Reynolds [Fri, 15 Jan 2016 20:21:22 +0000 (20:21 +0000)]
Merge "Importance slide updates."
Julia Reynolds [Fri, 15 Jan 2016 19:23:13 +0000 (14:23 -0500)]
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
Noah Wang [Thu, 14 Jan 2016 00:55:07 +0000 (16:55 -0800)]
Add dot page indicator to preview screen pager.
Change-Id: I4fa5aba28ad20be17bd5fa8d3c6a06d8a9a4a64a
Noah Wang [Fri, 15 Jan 2016 18:30:26 +0000 (18:30 +0000)]
Merge "Accomodating multiple preview screen with ViewPager for the users to swipe across, along with some UI refinements."
Pavel Zhamaitsiak [Fri, 15 Jan 2016 17:49:12 +0000 (17:49 +0000)]
Merge "IMS: Make wifi call settings UI non indexable"
Udam Saini [Fri, 15 Jan 2016 17:45:59 +0000 (17:45 +0000)]
Merge "Fixes alignment for fingerprint animation during setup."
Anju Mathapati [Mon, 27 Jul 2015 11:44:14 +0000 (17:14 +0530)]
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
Julia Reynolds [Fri, 15 Jan 2016 16:44:26 +0000 (16:44 +0000)]
Merge "Obey rule instance limit."
Julia Reynolds [Fri, 15 Jan 2016 15:11:16 +0000 (10:11 -0500)]
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
Jason Monk [Fri, 15 Jan 2016 14:31:40 +0000 (14:31 +0000)]
Merge "Settings Hooks launch wrong activity" am:
69704608f4
am:
6cbc7e4f85 -s ours
* commit '
6cbc7e4f85a17c49d787025fbd73c7ebe3b0385b':
Settings Hooks launch wrong activity
Jason Monk [Fri, 15 Jan 2016 14:11:09 +0000 (14:11 +0000)]
Merge "Settings Hooks launch wrong activity"
am:
69704608f4
* commit '
69704608f4801a1362a28b37962f560d834da3da':
Settings Hooks launch wrong activity
Jason Monk [Fri, 15 Jan 2016 14:07:27 +0000 (14:07 +0000)]
Merge "Settings Hooks launch wrong activity"
Benjamin Franz [Fri, 15 Jan 2016 14:04:02 +0000 (14:04 +0000)]
Merge "Resolve new intent that allows setting the parent challenge"
Benjamin Franz [Fri, 8 Jan 2016 17:16:19 +0000 (17:16 +0000)]
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
Henrik Baard [Fri, 15 Jan 2016 07:40:49 +0000 (08:40 +0100)]
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
Noah Wang [Tue, 12 Jan 2016 17:00:57 +0000 (09:00 -0800)]
Accomodating multiple preview screen with ViewPager for the users to
swipe across, along with some UI refinements.
Change-Id: I9487bcce88cdab490a4b6baa752224acddc5be52
Udam Saini [Fri, 15 Jan 2016 00:30:49 +0000 (16:30 -0800)]
Fixes alignment for fingerprint animation during setup.
bug:
26416907
Change-Id: I4da2166b5079cb97fac4547e720b042b9cbe5ac2
Steve Pfetsch [Thu, 14 Jan 2016 01:07:35 +0000 (17:07 -0800)]
Enable color temperature developer setting
Add a switch in Developer Settings to enable "cool" color temperature
mode.
Bug:
26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
Robin Lee [Thu, 14 Jan 2016 17:53:50 +0000 (17:53 +0000)]
Merge "Show app VPNs in always-on list"
Noah Wang [Thu, 14 Jan 2016 17:48:26 +0000 (17:48 +0000)]
Merge "Modifying sample preview text for font size setting."
Robin Lee [Tue, 5 Jan 2016 18:34:23 +0000 (18:34 +0000)]
Show app VPNs in always-on list
Bug:
22547950
Change-Id: I1b37f3b8d2a061f9f6fba3c8b9a95f3b7edcee64
Bart Sears [Thu, 14 Jan 2016 05:19:59 +0000 (21:19 -0800)]
resolve merge conflicts of
7e0586b7a6 to master.
Change-Id: I73b3e010249ac7380677cb2e635f4c847a8446c4
Noah Wang [Thu, 14 Jan 2016 04:02:54 +0000 (20:02 -0800)]
Modifying sample preview text for font size setting.
Change-Id: I4bbf1d0d81496de8e9c70a425db2aa503e5b76e0
Justin Harrison [Thu, 14 Jan 2016 02:08:36 +0000 (02:08 +0000)]
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
Justin Harrison [Thu, 14 Jan 2016 02:04:47 +0000 (02:04 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
am:
0c38aca074
* commit '
0c38aca074d0e069eb214abc91eeb024b5121b73':
Add strings for color temperature developer option
Justin Harrison [Thu, 14 Jan 2016 01:56:42 +0000 (01:56 +0000)]
Merge "Add strings for color temperature developer option" into mnc-dr1.5-dev
Steve Pfetsch [Wed, 13 Jan 2016 23:22:56 +0000 (15:22 -0800)]
Add strings for color temperature developer option
Introducing en-US strings for color temperature settings ahead of code
changes.
Bug:
26110238
Change-Id: I5a12aa35a730d93daa6383f7dde7d3c90db1d74b
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':
OSDN Git Service
