OSDN Git Service
Bill Yi [Mon, 22 Aug 2016 19:57:11 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic0668c1bf03195d38aabb92176ae6ff6d6f079d2
Auto-generated-cl: translation import
Meng Wang [Mon, 22 Aug 2016 04:46:46 +0000 (04:46 +0000)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
am:
5ea4bb2f43 -s ours
Change-Id: Iba62c6b007ad0d68d528047896dfd88961a953cd
Meng Wang [Thu, 18 Aug 2016 19:19:01 +0000 (12:19 -0700)]
DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
Bug:
30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
(cherry picked from commit
4436d6fe16c3a685b839358006183d1e8d304a33)
TreeHugger Robot [Fri, 19 Aug 2016 22:40:08 +0000 (22:40 +0000)]
Merge "Fixed storage calculation when SD card is adopted as internal storage." into nyc-mr1-dev
Roozbeh Pournader [Fri, 19 Aug 2016 21:36:32 +0000 (21:36 +0000)]
Merge "Changing the languages drag handle as per the Material Design spec" into nyc-mr1-dev
Fan Zhang [Tue, 16 Aug 2016 01:31:55 +0000 (18:31 -0700)]
Extend conditional button width so it has more click area.
Bug:
30822058
Change-Id: I88a88c7807309741113e4b5557686c08261eb5d0
(cherry picked from commit
40b56b4c15f3b5e6984902d0fe267494dbe8ead2)
Bill Yi [Fri, 19 Aug 2016 14:39:53 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0efafca736424685e687ac6f08884fdc5e69e88d
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 18 Aug 2016 21:59:16 +0000 (21:59 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
Ajay Panicker [Thu, 18 Aug 2016 20:17:19 +0000 (13:17 -0700)]
Do not allow apps to cause Bluetooth to be discoverable forever
Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.
Bug:
28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77
Meng Wang [Thu, 18 Aug 2016 19:19:01 +0000 (12:19 -0700)]
WiFiCallingSettings: hide wfc mode preference if not editable
Bug:
30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
Julia Reynolds [Wed, 17 Aug 2016 16:42:25 +0000 (16:42 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev
Fan Zhang [Tue, 9 Aug 2016 23:27:54 +0000 (16:27 -0700)]
Load default data warning value instead of hardcode it.
Bug:
30898071
Change-Id: I36f3669ca07862476c778aabb1290f3ceb3afc92
Bill Yi [Tue, 16 Aug 2016 09:31:55 +0000 (02:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib98e5307dd77c0295e16e465c0f12d362749ea4b
Auto-generated-cl: translation import
Felipe Leme [Mon, 8 Aug 2016 18:04:30 +0000 (11:04 -0700)]
Fixed storage calculation when SD card is adopted as internal storage.
A SD Card can be set as internal storage, in which case its total must
be added to the total internal storage size.
Prior to this change, the total internal storage size was hardcoded as
the value returned by Storage Manager.
Also fixed the storage summary total to exclude portable devices.
** Cherrypick of
c53410c41148a3882673ba1a3d95dd050649ea2a **
Fixes:
30689428
BUG:
30742322
Change-Id: I1e33038eeebc91f3c525a387a97987391c10f2f9
Fan Zhang [Mon, 15 Aug 2016 20:22:42 +0000 (13:22 -0700)]
Don't dial any number if DIAL intent is not supported.
Bug:
30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209
TreeHugger Robot [Fri, 12 Aug 2016 20:28:10 +0000 (20:28 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 19:58:26 +0000 (19:58 +0000)]
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
Fan Zhang [Fri, 12 Aug 2016 17:44:23 +0000 (10:44 -0700)]
Strings in a diclaimer dialog when turning on NFC.
Bug:
30834503
Change-Id: If18fe3ae075d96fbac20751d91d10a03d3396a53
TreeHugger Robot [Fri, 12 Aug 2016 09:25:46 +0000 (09:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 01:25:13 +0000 (18:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8eeb62c2d3038fb78118c0f2d08f94329f441be5
Auto-generated-cl: translation import
Jeremy Klein [Thu, 11 Aug 2016 22:57:29 +0000 (15:57 -0700)]
Fix a broken TetherServiceTest.
This should have been updated when I changed settings to use the new
tethering API.
Bug:
30814807
Change-Id: I3853e6abf1e9976aedae70d4ff41336940545b64
Adrian Roos [Thu, 11 Aug 2016 22:45:22 +0000 (15:45 -0700)]
Assist: Allow disabling the disclosure animation
Change-Id: I18a2e4144c762a0833d2384c51f916b841dfc8b3
Fixes:
30809067
Matthew Fritze [Tue, 9 Aug 2016 22:35:26 +0000 (22:35 +0000)]
Merge "Update support tab strings." into nyc-mr1-dev
Matthew Fritze [Tue, 9 Aug 2016 21:46:14 +0000 (14:46 -0700)]
Update support tab strings.
Bug:
30757866
Change-Id: Ia0df640e548b57ed034e97a34c396f55eb850e73
Geoffrey Pitsch [Mon, 8 Aug 2016 19:39:33 +0000 (15:39 -0400)]
Boot Sounds setting in OtherSoundSettings
Uses a persistent system property so it can be accessed by bootanim.
BUG:
30690353
Change-Id: Iffb7e140074b8bf4b0faabdecbbf163b14360655
Philip P. Moltmann [Mon, 8 Aug 2016 21:54:22 +0000 (21:54 +0000)]
Merge "Set Fragment title in onCreate." into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 19:51:32 +0000 (19:51 +0000)]
Merge "Update OEM unlock summary string" into nyc-mr1-dev
Philip P. Moltmann [Mon, 8 Aug 2016 17:57:22 +0000 (10:57 -0700)]
Set Fragment title in onCreate.
To allow the accessibility to read the title early enough.
Fixes:
30677578
Change-Id: I2dbd8f0fa7697038cf69e0282ebcb590fbc64cc2
Esteban Talavera [Mon, 8 Aug 2016 14:38:01 +0000 (15:38 +0100)]
Update OEM unlock summary string
Bug:
30661116
Bug:
29047618
Change-Id: I4f747e29c595453d9d0263ce7fc90d37b81aa251
Bill Yi [Mon, 8 Aug 2016 05:18:11 +0000 (22:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I121e7fd3c6829cf3b81a31ffedeec6fac4e4a482
Auto-generated-cl: translation import
Maurice Lam [Fri, 5 Aug 2016 22:06:30 +0000 (22:06 +0000)]
Merge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev
Maurice Lam [Fri, 5 Aug 2016 19:06:05 +0000 (12:06 -0700)]
Use different text in fingeprint intro for SUW
Bug:
30681287
Change-Id: Idd03b96c9447523f3128e559be213d89691f4ce1
Doris Ling [Fri, 5 Aug 2016 18:36:33 +0000 (11:36 -0700)]
Revert change to move Display->Ambient Display to Moves->Quick screen
check.
1. Add back original toggle for Display->Ambient Display and revert
summary text.
2. Remove Moves->Quick screen check preference and related scroll logic.
3. Remove ambient display related animation videos
Bug:
30686297
Change-Id: Ie01a201f0a8deb0a858bc2a7f9cc607b749ab6e4
Doris Ling [Mon, 1 Aug 2016 21:56:26 +0000 (14:56 -0700)]
Change Display->Ambient Display to Display->Quick screen check.
Update the preference title for Ambient display and add metrics logging
when user selects it.
Bug:
29994493
Change-Id: Ibeaa60889d3f4394c924471b21baa929d469db71
TreeHugger Robot [Thu, 4 Aug 2016 09:20:36 +0000 (09:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 00:18:43 +0000 (00:18 +0000)]
Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev
Bill Yi [Wed, 3 Aug 2016 23:08:38 +0000 (16:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I823618147887ae9229f84bfb2be9b85babdfab0d
Auto-generated-cl: translation import
Fan Zhang [Wed, 3 Aug 2016 21:47:01 +0000 (14:47 -0700)]
Update summary correctly in Settings dashboard.
Bug:
30490325
SummaryLoader needs DashboardCategory to update summary and it currently
ask for it from DashboardAdapter. But DashboardCategory is not always
available in DashboardAdapter. When SummaryLoader wants to get category
from adapter before adapter is ready, it won't have it, causing summary
to appear blank sometimes.
The fix is to get category from data source directly.
Change-Id: I9d7f676954d1cece42d6e03748ab7aa35357f8b7
Fan Zhang [Wed, 3 Aug 2016 21:59:06 +0000 (21:59 +0000)]
Merge "Hide travel abroad button initially." into nyc-mr1-dev
Fan Zhang [Wed, 3 Aug 2016 19:58:07 +0000 (12:58 -0700)]
Hide travel abroad button initially.
Bug:
30632031
This button needs to be initially hidden so user can't accidentally
click it before data is ready.
Change-Id: I8cdd1f68bdcb5ba7ecbde34e72d85a5da1fa4a3d
Jeremy Klein [Wed, 3 Aug 2016 18:54:12 +0000 (18:54 +0000)]
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev
Mihai Nita [Wed, 3 Aug 2016 16:31:00 +0000 (09:31 -0700)]
Changing the languages drag handle as per the Material Design spec
It should use 4 horizontal bars, as per Material Design spec:
https://material.google.com/components/lists-controls.html#lists-controls-types-of-list-controls
(search for "Reorder", there is no direct link)
The new icon comes from
https://design.google.com/icons/#ic_reorder
Bug:
30260880
Change-Id: I27a38cef864b97dd23c83cce2bb2859b268e4bd4
Tony Mak [Wed, 3 Aug 2016 09:28:24 +0000 (09:28 +0000)]
Merge "Hide redundant restrictions" into nyc-mr1-dev
TreeHugger Robot [Wed, 3 Aug 2016 00:43:24 +0000 (00:43 +0000)]
Merge "Update string for FallbackHome" into nyc-mr1-dev
Jorim Jaggi [Tue, 2 Aug 2016 20:13:32 +0000 (22:13 +0200)]
Update string for FallbackHome
Also add some margins in case the string is really long
Change-Id: I0b5246d51d670316c8578475aedac00f8c090e57
Fixes:
30213213
TreeHugger Robot [Tue, 2 Aug 2016 19:26:40 +0000 (19:26 +0000)]
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev
TreeHugger Robot [Tue, 2 Aug 2016 19:07:47 +0000 (19:07 +0000)]
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev
Jorim Jaggi [Tue, 2 Aug 2016 09:53:12 +0000 (11:53 +0200)]
Show progress user unlocking is delayed
Sometimes it takes a while to unlock a user, for example, after an OTA.
In these cases, we show a progress bar in FallbackHome so the user knows
that something is happening.
Fixes:
30213213
Change-Id: Ie36a9b3107c32ff46a8890818d1f26ccf310ee6c
Tony Mak [Tue, 2 Aug 2016 16:09:53 +0000 (17:09 +0100)]
Hide redundant restrictions
Change-Id: Id9b8ec6f045632a87092b4dccef5f7ff73a327cc
Fix:
30109035
Bill Yi [Tue, 2 Aug 2016 00:43:36 +0000 (17:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icbf8d39b372bdfad0e5dd5eec9753a8725ec0c90
Auto-generated-cl: translation import
Jeremy Klein [Sat, 30 Jul 2016 02:22:21 +0000 (19:22 -0700)]
Set the tether Entitlement app as active when enabling tethering.
This fixes tether entitlement timeouts when tethering is enabled
via the QS tile.
Bug:
29514913
Change-Id: I975bf3e52d2df49541544d1b7a6bdcdec1b61d8c
Fan Zhang [Mon, 1 Aug 2016 21:31:15 +0000 (21:31 +0000)]
Merge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev
Fan Zhang [Mon, 1 Aug 2016 20:58:57 +0000 (13:58 -0700)]
Set correct flag when enabling listener for conditions.
Bug:
30551655
Without this flag Settings app will close whenever listener is
enabled/disabled.
Change-Id: I99102308ada3897cf44917e96015c71b926e5fb5
Fan Zhang [Mon, 1 Aug 2016 16:40:06 +0000 (09:40 -0700)]
Log switch toggle action whenever its status changes.
Bug:
30110675
onClick is only called when the switchbar is clicked. We also need to
log when switch itself is clicked.
Change-Id: I892b72daeefe0f36608a73fe509199e200376eb7
Meng Wang [Mon, 1 Aug 2016 17:19:15 +0000 (10:19 -0700)]
Hide sim card selection UI when only one sim presents
Bug:
30319100
Change-Id: I9bb8409475d9431463516117b54d34cbdfb317b9
Fan Zhang [Fri, 29 Jul 2016 20:58:30 +0000 (13:58 -0700)]
Align battery consumer app title to view start.
Bug:
30161009
This makes sure in RTL language app titles start from right.
Change-Id: I87030121f39519d09e5872eb4c01ec682f69db55
Vineeta Srivastava [Fri, 29 Jul 2016 01:27:05 +0000 (01:27 +0000)]
Merge "Show IMEI SV when phone has LTE_ON_CDMA_TRUE" into nyc-mr1-dev
Vineeta Srivastava [Thu, 28 Jul 2016 23:38:55 +0000 (16:38 -0700)]
Show IMEI SV when phone has LTE_ON_CDMA_TRUE
Bug:
30463148
Change-Id: I518278725d0980b9a98ddf0cf01d65eab3dbb74d
Doris Ling [Thu, 28 Jul 2016 23:28:16 +0000 (23:28 +0000)]
Merge "Update UI for gesture settings." into nyc-mr1-dev
TreeHugger Robot [Thu, 28 Jul 2016 23:07:02 +0000 (23:07 +0000)]
Merge "Check if InputMethodService is Direct Boot aware" into nyc-mr1-dev
Bill Yi [Thu, 28 Jul 2016 22:27:06 +0000 (22:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Doris Ling [Thu, 28 Jul 2016 20:54:14 +0000 (13:54 -0700)]
Update UI for gesture settings.
1. Add list divider between each gesture preference
2. Increase top-padding from 16dp to 24dp
3. Move fingerprint swipe preference to the top of the list
4. Change default value for fingerprint swipe to OFF.
Bug:
30416729
Change-Id: If0a6ee080defb2e3dbd36fbda6e047c23a1b1026
Fan Zhang [Thu, 28 Jul 2016 18:48:59 +0000 (11:48 -0700)]
Remove spacer above dashboard tiles.
Bug:
30467152
- UX is better without the spacer.
- It also causes animation issues in recycler view during cold start.
Change-Id: I3aab330ea60bba69962132a54e432943e81ff985
Bill Yi [Thu, 28 Jul 2016 19:07:48 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ae8abcbb85c81ee4cdfdec59293cc4d891032e9
Auto-generated-cl: translation import
Fan Zhang [Thu, 28 Jul 2016 18:25:59 +0000 (18:25 +0000)]
Merge "Add non-transparent background to dashboard items." into nyc-mr1-dev
TreeHugger Robot [Thu, 28 Jul 2016 17:58:00 +0000 (17:58 +0000)]
Merge "Assist and Voice Input SwitchPreferences animate with talkback" into nyc-mr1-dev
Fan Zhang [Thu, 28 Jul 2016 17:49:38 +0000 (10:49 -0700)]
Add non-transparent background to dashboard items.
Bug:
30297664
In previous CL I missed the background on this tile.
Change-Id: I87b1716dbcb0f79c6f7532f3ac2397feb3b4dfd0
Maurice Lam [Thu, 28 Jul 2016 03:37:18 +0000 (03:37 +0000)]
Merge "Update fingerprint strings" into nyc-mr1-dev
TreeHugger Robot [Thu, 28 Jul 2016 02:57:23 +0000 (02:57 +0000)]
Merge "Force talkback to read imei # digit by digit" into nyc-mr1-dev
Salvador Martinez [Wed, 27 Jul 2016 23:40:54 +0000 (16:40 -0700)]
Force talkback to read imei # digit by digit
Made changes to the file so that it uses Spannables instead
of just strings. This will allow us to tell Android Talkback
how we would like the strings read.
Fixes:
30402792
Change-Id: I893a2cbf3de092f81d927bad36523efb08dd7265
TreeHugger Robot [Thu, 28 Jul 2016 01:33:42 +0000 (01:33 +0000)]
Merge "Display storage summary with correct used/total size." into nyc-mr1-dev
Maurice Lam [Thu, 28 Jul 2016 00:40:23 +0000 (17:40 -0700)]
Update fingerprint strings
Bug:
30443091
Change-Id: I1634a97090147cd19dd3fd65eef06ebc401ddd1b
TreeHugger Robot [Thu, 28 Jul 2016 01:08:35 +0000 (01:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Matthew Fritze [Wed, 27 Jul 2016 23:52:49 +0000 (16:52 -0700)]
Assist and Voice Input SwitchPreferences animate with talkback
Toggling Use text from screen now animates the switch preference
and has the appropriate "on/off" talkback response.
Change-Id: Ib5f940f251c45ead3a908d7f762eebb5f76931fb
Fixes:
30205119
Fan Zhang [Wed, 27 Jul 2016 23:51:58 +0000 (16:51 -0700)]
Display storage summary with correct used/total size.
Fixes:
30421727
We need to first initialize sTotalInternalStorage in order to compute
used size for both full blown storage fragment and storage tile summary.
Also fixed a bug where sTotalInteralStorage is incorrectly added
multiple times when there are multiple private volumes.
Change-Id: Iabb869c3184ec0c468aeacea34c804b90b4965f1
Fan Zhang [Wed, 27 Jul 2016 23:49:56 +0000 (23:49 +0000)]
Merge "Never disable DnD receiver to dislay condition correctly." into nyc-mr1-dev
Yohei Yukawa [Wed, 27 Jul 2016 23:24:37 +0000 (16:24 -0700)]
Check if InputMethodService is Direct Boot aware
This is a small follow up CL to the previous CL [1] that added
functionality to show a warning dialog when Direct Boot unaware apps and
IMEs are being selected.
In the previous CL, we checked whether the package to which the IME
belogs to is (fully or partially) Direct Boot aware. If the package is
partially Direct Boot aware but the InputMethodService in question is
still Direct Boot unaware, the user will not see the warning dialog.
Luckily in InputMethodPreference we already have InputMethodInfo that
indirectly exposes ServiceInfo#directBootAware. By directly checking
that bit we can simplify the logic and avoid such false negatives.
[1]: I0498904d2f664fb41e8c1e6bb30d1cbf437cf4b9
4a8136b51b746961aac6f5ce2459effef8c22680
Bug:
27196876
Change-Id: I869a7bd87748f09f7032a60b34ac0dbdc4a00b72
Doris Ling [Wed, 27 Jul 2016 23:14:38 +0000 (23:14 +0000)]
Merge "Fix crash when support item is clicked." into nyc-mr1-dev
Bill Yi [Wed, 27 Jul 2016 23:13:39 +0000 (16:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f47d6e170f361a07af6e0ad84891d70972cfbc7
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 27 Jul 2016 22:47:39 +0000 (22:47 +0000)]
Merge "Warn users when selecting non-Direct Boot apps." into nyc-mr1-dev
Jeff Sharkey [Wed, 27 Jul 2016 18:53:34 +0000 (12:53 -0600)]
Warn users when selecting non-Direct Boot apps.
Certain apps like Phone, SMS, Emergency Info, and IME are critical
enough that they ideally need to be runnable before the device is
unlocked after a reboot. Users can still pick non-Direct Boot aware
apps, but this change now warns users that the selected app won't be
runnable until after unlocking.
Bug:
27196876
Change-Id: I0498904d2f664fb41e8c1e6bb30d1cbf437cf4b9
Justin Klaassen [Wed, 27 Jul 2016 03:57:27 +0000 (20:57 -0700)]
Night display settings UI v2
Bug:
30155646
Change-Id: I912e90e5ec5e8d7426c68484da8396219a40c5ad
Fan Zhang [Wed, 27 Jul 2016 00:54:05 +0000 (17:54 -0700)]
Never disable DnD receiver to dislay condition correctly.
Bug:
30360853
Change-Id: I3e470c2955d7f066970442e281f9d66b153b8d10
TreeHugger Robot [Wed, 27 Jul 2016 00:58:24 +0000 (00:58 +0000)]
Merge "Catch RejectedExecutionException when loading app data." into nyc-mr1-dev
TreeHugger Robot [Tue, 26 Jul 2016 22:47:29 +0000 (22:47 +0000)]
Merge "Only set fullIndex flag when performing a full update" into nyc-mr1-dev
Jeff Sharkey [Tue, 26 Jul 2016 21:52:04 +0000 (21:52 +0000)]
Merge "Offer trampoline to help articles." into nyc-mr1-dev
Justin Klaassen [Tue, 26 Jul 2016 21:29:52 +0000 (14:29 -0700)]
Only set fullIndex flag when performing a full update
Previously UpdateData#fullIndex was default true which meant if a
partial update came in before a call to Index#update() then the
partial update would be treated as a full index and future calls
to Index#update() would be ignored.
Bug:
30366360
Change-Id: I6e2738c25c9623f49171ecba0f3e0ce0076b7e42
Fan Zhang [Tue, 26 Jul 2016 19:16:45 +0000 (12:16 -0700)]
Catch RejectedExecutionException when loading app data.
Default thread pool from AsyncTask can queue up to a certain number of
tasks. We will use a custom pool with enough queue size to load app
data.
Fixes:
30355247
Change-Id: I5ad4c340191c785463011c1698d1d4625aba44ec
Jeff Sharkey [Tue, 19 Jul 2016 00:28:55 +0000 (18:28 -0600)]
Offer trampoline to help articles.
This allows other parts of the system internals to re-use common
logic for building help links, and it allows all help links to live
in a single common overlay.
Adds a help link slot for "Android is upgrading" notification.
Bug:
30033319,
30122837
Change-Id: I7dec3e63cfb8c7a8ee9a562cc61cb70f3f99fdae
Fan Zhang [Mon, 25 Jul 2016 22:13:27 +0000 (22:13 +0000)]
Merge "Revert "About Phone" summary back to Android version." into nyc-mr1-dev
Fan Zhang [Mon, 25 Jul 2016 22:13:17 +0000 (22:13 +0000)]
Merge "Refresh state after loading conditions from xml." into nyc-mr1-dev
Fan Zhang [Mon, 25 Jul 2016 21:20:40 +0000 (14:20 -0700)]
Revert "About Phone" summary back to Android version.
Change-Id: Icc834b8fb1fd9235092cee720c904c8532b8e3fc
Fixes:
30355258
Bug:
28419411
Doris Ling [Mon, 25 Jul 2016 20:22:30 +0000 (13:22 -0700)]
Fix crash when support item is clicked.
Check for existing activity to handle the support item intent before
adding it to support tile or trying to launch the activity.
Change-Id: I42a733c2d862b303773aeee1ba3b21b718e59066
Fixes:
29118295
Fan Zhang [Mon, 25 Jul 2016 19:55:36 +0000 (12:55 -0700)]
Refresh state after loading conditions from xml.
Fixes:
30330909
When start Settings, conditions is loaded from a xml with potentially
stale state. ConditionLoader needs to refresh states after reading xml
to make sure they are up to date.
Change-Id: Ice1b8bacb0486c5dd230b83670c1494710d1c061
Phil Weaver [Mon, 25 Jul 2016 20:23:06 +0000 (20:23 +0000)]
Merge "Fix return when virtual keyboard setting changes." into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 18:35:56 +0000 (18:35 +0000)]
Merge "Fix multiple bluetooth devices bug" into nyc-mr1-dev
Makoto Onuki [Mon, 25 Jul 2016 18:12:00 +0000 (18:12 +0000)]
Merge "Improve string comment" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 16:46:07 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 14:37:39 +0000 (10:37 -0400)]
Fix multiple bluetooth devices bug
Was bug in some code trying to handle preference animations better.
Since those animations are all disabled now, just remove everything
again and re-add it.
Change-Id: If1ce07a8f2b4144d95a95cec6ebb1b423644825a
Fixes:
29314480
Bill Yi [Mon, 25 Jul 2016 14:34:40 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I460a8a0f711298b1658451774c021e8d4a3d2087
Auto-generated-cl: translation import