OSDN Git Service
Robin Lee [Mon, 25 Jan 2016 12:24:27 +0000 (12:24 +0000)]
Test: parcel marshalling for user credentials page
Unit test to verify that the internal Credential that gets passed to
dialogs for removing said credential is actually a valid Parcelable
object, since it's hard to provoke a marshal/unmarshal in real-world
usage (but not impossible).
Bug:
22541933
Change-Id: I780ca2d7b01fc6081b9ea8b2810cfc97f0433a86
Robin Lee [Fri, 22 Jan 2016 17:46:02 +0000 (17:46 +0000)]
Merge "Convert credential view to DialogFragment"
Robin Lee [Tue, 19 Jan 2016 11:42:57 +0000 (11:42 +0000)]
Convert credential view to DialogFragment
Bug:
26352310
Change-Id: Ic6af37c893eec5a83e198b9f23ebd766e88e0109
Maurice Lam [Fri, 22 Jan 2016 17:17:38 +0000 (17:17 +0000)]
Merge "Use RestrictedRadioButton in SetupRedactionInterstitial"
Benjamin Franz [Mon, 18 Jan 2016 17:31:26 +0000 (17:31 +0000)]
Read work challenge background color from device policy
Call into DevicePolicyManager to retrieve the background color that
should be used for the work challenge on the user whose credential
screen we're about to show.
Change-Id: I612dd96020ce8932b49b21e6ff6faaddd39f957d
Benjamin Franz [Fri, 22 Jan 2016 12:27:00 +0000 (12:27 +0000)]
Merge "Add background image for work challenge"
Kenny Root [Fri, 22 Jan 2016 03:30:35 +0000 (19:30 -0800)]
resolve merge conflicts of
bdc6074276 to master.
Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359
Maurice Lam [Fri, 22 Jan 2016 02:09:43 +0000 (18:09 -0800)]
Use RestrictedRadioButton in SetupRedactionInterstitial
Bug:
26704975
Change-Id: I857dc0e57d1aaada06be4945b0e377291864ea89
Kenny Root [Thu, 21 Jan 2016 22:12:38 +0000 (22:12 +0000)]
Merge "Stop using AlgNameMapper"
am:
8646736618
* commit '
86467366183e7b7ca006456474cca50332213ca5':
Stop using AlgNameMapper
Kenny Root [Thu, 21 Jan 2016 21:53:11 +0000 (21:53 +0000)]
Merge "Stop using AlgNameMapper"
Jason Monk [Thu, 21 Jan 2016 19:15:46 +0000 (14:15 -0500)]
Fix build.
Change-Id: I43201fc9bb989d3f490ba26cb93956878745e366
Sudheer Shanka [Thu, 21 Jan 2016 19:07:02 +0000 (19:07 +0000)]
Merge "Add padlocks to preferences that can be disabled by policy."
Sudheer Shanka [Thu, 21 Jan 2016 18:46:17 +0000 (18:46 +0000)]
Merge "Add padlock to usb modes when disabled by admin."
Sudheer Shanka [Wed, 20 Jan 2016 20:55:39 +0000 (20:55 +0000)]
Add padlock to usb modes when disabled by admin.
Change-Id: I8504febd78f083eb3ff88926fe29d69edc62b6ef
Clara Bayarri [Thu, 21 Jan 2016 17:50:17 +0000 (17:50 +0000)]
Merge "Fix bugs around unification when no password is set"
Andres Morales [Wed, 13 Jan 2016 23:28:54 +0000 (15:28 -0800)]
Track ro.flash.locked bit to enable/disable OEM unlocking pref
if the device is OEM unlocked already, disable the OEM
unlocking pref. If it's locked, enable.
Bug:
26039090
Change-Id: I915f3cf57deef8f5775d466dec59c891c1546b1b
Clara Bayarri [Wed, 20 Jan 2016 15:39:59 +0000 (15:39 +0000)]
Fix bugs around unification when no password is set
- When in a unified state, selecting the work lock to be "none" caused
a security exception
- When the work lock was set to "none", unifying didn't work
- When in a unified state, the work lock type selection screen showed
"none" as the current type instead of the device lock type
Bug:
26577247
Change-Id: I853d77186e23b6a458eaa6c1047942a7eefddc9c
Jason Monk [Thu, 21 Jan 2016 14:43:35 +0000 (09:43 -0500)]
Protect against missing subscriptions
Bug:
26676464
Change-Id: I428dd60e6774f7ca88423edb7a87e51ee8a7dadd
Benjamin Franz [Wed, 13 Jan 2016 12:16:25 +0000 (12:16 +0000)]
Add background image for work challenge
If the challenge shown is for a work profile, add the default image and
color to the background of the fragment.
Change-Id: I148c6cd3a835a84c7bac78b020839dfdae4a6c36
Benjamin Franz [Thu, 21 Jan 2016 10:43:30 +0000 (10:43 +0000)]
Merge "Add unit tests to Utils"
Adam Lesinski [Thu, 21 Jan 2016 02:22:05 +0000 (02:22 +0000)]
Merge "Add bt traffic accounting"
Kenny Root [Wed, 20 Jan 2016 23:50:55 +0000 (15:50 -0800)]
Stop using AlgNameMapper
AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.
Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
Sudheer Shanka [Wed, 20 Jan 2016 21:10:04 +0000 (21:10 +0000)]
Merge "Add restricted padlocks to radio buttons."
Sudheer Shanka [Wed, 20 Jan 2016 21:09:27 +0000 (21:09 +0000)]
Merge "Trigger a support dialog when an action is disabled by policy"
Sudheer Shanka [Fri, 15 Jan 2016 12:20:46 +0000 (12:20 +0000)]
Trigger a support dialog when an action is disabled by policy
Change-Id: I847b481a16cce33fe7bd4040d38ec50ca62172c2
Mihai Nita [Tue, 12 Jan 2016 16:55:05 +0000 (08:55 -0800)]
Implement multiple locales and sublocales in Settings
Does drag-and-drop reordering, supports adding / removing locales,
suggestions, search, removes locales already selected in the
user preferences.
Bug:
25800339
Change-Id: Iffe7b9810c77ec93a84d848ab20b2ba405249676
Benjamin Franz [Wed, 20 Jan 2016 12:20:15 +0000 (12:20 +0000)]
Add unit tests to Utils
1. Switch to AndroidJUnitRunner
2. Add mockito support
3. Add tests for Utils class
Change-Id: I1eabfdf1d65456d71363b8970beee9239a90ada2
Geoff Mendal [Wed, 20 Jan 2016 18:16:34 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE am:
ffb0eb03a7 -s ours am:
97898c5cd2 -s ours
am:
a3bb93f1cc -s ours
* commit '
a3bb93f1ccc216159fa102ef3aca8cf7f0e22759':
Import translations. DO NOT MERGE
Sudheer Shanka [Wed, 20 Jan 2016 18:09:54 +0000 (18:09 +0000)]
Merge "Check for MANAGE_DEVICE_ADMINS permission instead of uids."
Geoff Mendal [Wed, 20 Jan 2016 17:52:58 +0000 (17:52 +0000)]
Import translations. DO NOT MERGE am:
ffb0eb03a7 -s ours
am:
97898c5cd2 -s ours
* commit '
97898c5cd2033c331b537d9b17205e09d991e56d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:50:13 +0000 (17:50 +0000)]
Import translations. DO NOT MERGE am:
bcefb0397f -s ours
am:
c42498eddb -s ours
* commit '
c42498eddb7b687b999f7a2795db8c46055f778c':
Import translations. DO NOT MERGE
Sudheer Shanka [Wed, 13 Jan 2016 22:10:18 +0000 (22:10 +0000)]
Add padlocks to preferences that can be disabled by policy.
Change-Id: I43b6b5954ef6ec65b86d99321cabab9f49df842d
Geoff Mendal [Wed, 20 Jan 2016 17:43:14 +0000 (17:43 +0000)]
Import translations. DO NOT MERGE
am:
bcefb0397f -s ours
* commit '
bcefb0397f06f52a50e994418ae590581e217428':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 20 Jan 2016 17:41:58 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE
am:
ffb0eb03a7 -s ours
* commit '
ffb0eb03a729758c6477a701c07f39121ee95872':
Import translations. DO NOT MERGE
Jason Monk [Wed, 20 Jan 2016 16:37:01 +0000 (16:37 +0000)]
Merge "Fix DataUsageSummary in no sim state."
Jason Monk [Wed, 20 Jan 2016 16:33:46 +0000 (11:33 -0500)]
Fix DataUsageSummary in no sim state.
Bug:
26676464
Change-Id: I7fad5240f1160a2eb38a7cff2ae2f1c9e40bc4d3
Sudheer Shanka [Fri, 8 Jan 2016 20:40:55 +0000 (20:40 +0000)]
Add restricted padlocks to radio buttons.
Change-Id: Ibaf312a4c6c5fd9126ab7d45ccb094fc1bd46a1f
Julia Reynolds [Wed, 20 Jan 2016 16:16:07 +0000 (16:16 +0000)]
Merge "Add default alarm ringtone to sound settings."
Julia Reynolds [Wed, 20 Jan 2016 16:10:49 +0000 (11:10 -0500)]
Add default alarm ringtone to sound settings.
Bug:
25957833
Change-Id: I68d6747894665c97853eabac7edb0f751d1fdcc1
Geoff Mendal [Wed, 20 Jan 2016 15:40:11 +0000 (07:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfc8542b0e1f51163d9ff7f5327e851a08377d67
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 15:31:39 +0000 (07:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie620b53b05ebf701b1279275da7c4090c14ed446
Auto-generated-cl: translation import
Geoff Mendal [Wed, 20 Jan 2016 14:42:26 +0000 (06:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idec70dd78b29ef60ecf1614853358f1c0b1c98c8
Auto-generated-cl: translation import
Jason Monk [Tue, 19 Jan 2016 19:03:19 +0000 (19:03 +0000)]
Merge "Update data usage UX"
Jason Monk [Mon, 11 Jan 2016 19:27:20 +0000 (14:27 -0500)]
Update data usage UX
Update the UX and dig the data usage screen out of a huge whole of
technical debt. Switch every to use Preferences rather than standard
layouts and ListViews.
Split data usage into several fragments, all separated.
DataUsageSummary:
- Shows a summary of the 'default' usage at the top, this will be
the default sim on phones, or wifi if it has it, or ethernet
as last attempt to show something.
- Also has individual categories for each network type that has
data, cell, wifi, and ethernet. Maybe should look into bt though?
DataUsageList:
- Takes a NetworkTemplate as an input, and can only be reached from
the network specific categories in DataUsageSummary
- Shows a graph of current usage for that network and links to
app detail page for any app.
- Has gear link to quick get to billing cycle screen if available
BillingCycleSettings:
- Just a screen with the cycle day and warning/limits separated
out from the data usage.
AppDataUsage:
- App specific data usage details
- May need some UX iteration given lack of clarity in the spec
Bug:
22459566
Change-Id: I0222d8d7ea7b75a9775207a6026ebbdcce8f5e46
Steve Pfetsch [Tue, 19 Jan 2016 18:30:11 +0000 (18:30 +0000)]
Merge "Enable color temperature developer setting"
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
Adam Lesinski [Sat, 5 Dec 2015 01:01:23 +0000 (17:01 -0800)]
Add bt traffic accounting
Bug:
26039657
Change-Id: I8f8d0389b5b55e02b4a3528b010b76938d87a2a3
Sudheer Shanka [Mon, 18 Jan 2016 15:03:57 +0000 (15:03 +0000)]
Check for MANAGE_DEVICE_ADMINS permission instead of uids.
Currently, in ShowAdminSupportDetailsDialog we use uid check to
restrict only system to pass extras. Relaxing that condition to
allow any package with MANAGE_DEVICE_ADMINS permission to pass extras.
Change-Id: I0351c1f82321b2304a61b5831788806636402610
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
Steve Pfetsch [Thu, 14 Jan 2016 01:07:35 +0000 (17:07 -0800)]
Enable color temperature developer setting
Manual merge from mnc-dr1.5-dev.
Add a switch in Developer Settings to enable "cool" color temperature mode.
Bug:
26110238
Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
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