OSDN Git Service
Lei Yu [Fri, 2 Jun 2017 17:16:53 +0000 (17:16 +0000)]
Merge "Refine the ProgressCategory" into oc-dev am:
5f4f1b81af
am:
f2379e2ed3
Change-Id: Ibc809ffa4740e9f4a51975c4cdc94b5ff3f4643a
Lei Yu [Fri, 2 Jun 2017 17:13:55 +0000 (17:13 +0000)]
Merge "Refine the ProgressCategory" into oc-dev
am:
5f4f1b81af
Change-Id: I2b0fda608b8fe33eaa8ba6e7580c3becc1ebad71
Lei Yu [Fri, 2 Jun 2017 17:08:43 +0000 (17:08 +0000)]
Merge "Refine the ProgressCategory" into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 17:02:30 +0000 (17:02 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev am:
3efc502840
am:
5698552021
Change-Id: Ib0a9db86ea0191c4cd487842eb9ce49b9e6db2e0
Alison Cichowlas [Fri, 2 Jun 2017 16:56:59 +0000 (16:56 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
am:
3efc502840
Change-Id: Ib9006beaec685ef91583278585c9522f995d3c09
TreeHugger Robot [Fri, 2 Jun 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 16:37:50 +0000 (16:37 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev am:
4b29f593f0
am:
b143e15dd1 -s ours
Change-Id: I74811fefac1d831c4f851bfa783b1e0aee20f41a
Alison Cichowlas [Fri, 2 Jun 2017 15:48:25 +0000 (15:48 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev
am:
4b29f593f0
Change-Id: Ia4c0c9a506894033471b563f89e02a35cbf25601
Alison Cichowlas [Fri, 2 Jun 2017 15:39:44 +0000 (15:39 +0000)]
Merge "Add group name into channel summary, if applicable." into oc-dev
Bartosz Fabianowski [Fri, 2 Jun 2017 13:34:12 +0000 (13:34 +0000)]
Hide "Changes made by your organization's admin" when empty am:
493495452a
am:
98b216dc05 -s ours
Change-Id: Icd55cf9ce8a18578be783d057bd92a8ebdf639e0
Bartosz Fabianowski [Fri, 2 Jun 2017 13:30:12 +0000 (13:30 +0000)]
Hide "Changes made by your organization's admin" when empty
am:
493495452a
Change-Id: Ided6278456fe5ffdbb843717a1ec7070e7a3d3dc
Bartosz Fabianowski [Thu, 18 May 2017 09:46:38 +0000 (11:46 +0200)]
Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.
Bug:
35912953
Test: m RunSettingsRoboTests
Merged-in: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
Change-Id: I82ca00b757001390f9a517b0c07057bdc49dab20
Bartosz Fabianowski [Fri, 2 Jun 2017 08:43:11 +0000 (10:43 +0200)]
Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.
Bug:
35912953
Test: m RunSettingsRoboTests
Change-Id: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
Esteban Talavera [Fri, 2 Jun 2017 08:42:50 +0000 (08:42 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev am:
92f78354f9
am:
42d97f86c2
Change-Id: If2708bc27673b50dfdf7faa3300944d8bdb47b60
Esteban Talavera [Fri, 2 Jun 2017 08:38:51 +0000 (08:38 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev
am:
92f78354f9
Change-Id: I3dc5fd6bb4c7466b204946db179b10d9a3c9ccdf
Esteban Talavera [Fri, 2 Jun 2017 08:33:16 +0000 (08:33 +0000)]
Merge "Include disabled managed profiles in Accounts page" into oc-dev
Lorenzo Colitti [Fri, 2 Jun 2017 06:27:13 +0000 (06:27 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev am:
0187221bd8
am:
cc347f4e14
Change-Id: Idf82b916ae8121b837b7113af7ab182640124814
Lorenzo Colitti [Fri, 2 Jun 2017 06:18:13 +0000 (06:18 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev
am:
0187221bd8
Change-Id: I7873b3f06b40e416b89b44615e9fe28a5b3c7a29
TreeHugger Robot [Fri, 2 Jun 2017 06:11:51 +0000 (06:11 +0000)]
Merge changes from topic 'wifi_detail_jank' into oc-dev
* changes:
Reduce jank in the wifi detail status page.
Improve testing of IP address display code.
Sheng Wang [Fri, 2 Jun 2017 04:32:10 +0000 (04:32 +0000)]
Volume can not be updated in Sound¬ification am:
8c329af634
am:
d453911e27
Change-Id: I2bfd519b3d52f6e699d2d9a3be4753381821ce25
Sheng Wang [Fri, 2 Jun 2017 04:29:05 +0000 (04:29 +0000)]
Volume can not be updated in Sound¬ification
am:
8c329af634
Change-Id: I8031a9bbe82b40e79698e9d6be75bcd85bcde028
TreeHugger Robot [Fri, 2 Jun 2017 02:48:22 +0000 (02:48 +0000)]
Merge "Make BatterySettings Asynchronous and use enhanced estimate"
TreeHugger Robot [Fri, 2 Jun 2017 02:39:30 +0000 (02:39 +0000)]
Merge "Update string for recent apps."
TreeHugger Robot [Fri, 2 Jun 2017 01:18:20 +0000 (01:18 +0000)]
Merge "Check for null mReadOnlyApnTypes."
Salvador Martinez [Tue, 30 May 2017 18:18:09 +0000 (11:18 -0700)]
Make BatterySettings Asynchronous and use enhanced estimate
this CL changes BatteryInfo methods to all use the async style
callback approach it had for one of the methods. Non-async methods
are now annotated to only be used in worker threads. BatteryInfo
can now be obtained via callback by calling one of the async
methods. Alternatively if there is a worker thread available
the synchronous methods similar to the old ones can be used.
The callback methods have all been changed so that they cascade to a
async method that takes all the required info as paremeters. This
will minimize the amount of churn in files that currently use
BatteryInfo.
A new loader was created that can be used to get BatteryInfo in
places that wish to get it. This loader is used in
PowerUsageSummary to get the BatteryInfo.
Test: Robotests
Bug:
38399275
Bug:
38398949
Bug:
38399654
Change-Id: Ic5a82d8ca4c85fad1b883226327ec083badf861d
Doris Ling [Fri, 2 Jun 2017 00:22:37 +0000 (17:22 -0700)]
Update string for recent apps.
Bug:
62273254
Test: builds
Change-Id: I57a06b4bdfaa9c41636baeddcb94c71bf4518ebc
Sheng Wang [Fri, 2 Jun 2017 00:57:09 +0000 (00:57 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185 am:
161e3d14e1 am:
9dbd34a3d9
am:
61a420df95
Change-Id: I0ed31e1c4e8b1a74a2aca2288876ca57f05ca79c
TreeHugger Robot [Fri, 2 Jun 2017 00:41:10 +0000 (00:41 +0000)]
Merge "Don't index High usage summary"
TreeHugger Robot [Fri, 2 Jun 2017 00:32:22 +0000 (00:32 +0000)]
Merge "Restart loader in onResume"
Sheng Wang [Fri, 2 Jun 2017 00:27:56 +0000 (00:27 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185 am:
161e3d14e1
am:
9dbd34a3d9
Change-Id: I50a30452b6e0162070960ffdc35197ddef785609
Sheng Wang [Fri, 2 Jun 2017 00:25:17 +0000 (00:25 +0000)]
Merge "Volume can not be updated in Sound¬ification" am:
c0fdbab185
am:
161e3d14e1
Change-Id: Ie08f168cc2bf544d1f44a05f100a47d50ae15dd5
Sheng Wang [Fri, 2 Jun 2017 00:21:45 +0000 (00:21 +0000)]
Merge "Volume can not be updated in Sound¬ification"
am:
c0fdbab185
Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
Treehugger Robot [Fri, 2 Jun 2017 00:14:15 +0000 (00:14 +0000)]
Merge "Volume can not be updated in Sound¬ification"
Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]
Check for null mReadOnlyApnTypes.
Test: none
Bug:
62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
TreeHugger Robot [Thu, 1 Jun 2017 23:38:42 +0000 (23:38 +0000)]
Merge "Add strings in battery usage page"
Sheng Wang [Fri, 19 Aug 2016 09:09:32 +0000 (17:09 +0800)]
Volume can not be updated in Sound¬ification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.
To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.
Bug:
37558283
Test: manual, cherrypicking from AOSP
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
TreeHugger Robot [Thu, 1 Jun 2017 22:57:25 +0000 (22:57 +0000)]
Merge "Add group name into channel summary, if applicable."
jackqdyulei [Thu, 1 Jun 2017 01:03:09 +0000 (18:03 -0700)]
Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader
Bug:
62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
jackqdyulei [Thu, 1 Jun 2017 22:46:21 +0000 (15:46 -0700)]
Refine the ProgressCategory
1. Make the progressbar align with settings gear
2. Make text vertical center
Bug:
37190885
Test: Screenshot
Change-Id: Ib69b949179a0e097b78717cbe93c39aa0064ea9e
TreeHugger Robot [Thu, 1 Jun 2017 22:46:11 +0000 (22:46 +0000)]
Merge "Update strings for anomaly detection"
Andrew Sapperstein [Thu, 1 Jun 2017 22:28:08 +0000 (22:28 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev am:
fbc9035bcd
am:
0a35757003 -s ours
Change-Id: Icad5a856745ddafc5f79aecd81eceed46aeabb29
Andrew Sapperstein [Thu, 1 Jun 2017 22:17:44 +0000 (22:17 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
am:
fbc9035bcd
Change-Id: I63823bc03fe97fe683c9775b1b28f5cc770ae4e7
TreeHugger Robot [Thu, 1 Jun 2017 22:02:31 +0000 (22:02 +0000)]
Merge "Add search bar to SearchActivity." into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 21:41:38 +0000 (21:41 +0000)]
Merge "Hide saved network preference when there is none."
jackqdyulei [Thu, 1 Jun 2017 21:33:19 +0000 (14:33 -0700)]
Add strings in battery usage page
Add prefix:
1. "Used for" for foreground time
2. "Active for" for background time
Bug:
37162357
Test: RunSettingsRoboTests
Change-Id: Ifd4762640bd5ad98ce64ab174f7a7f44dbb1aa27
Matthew Fritze [Thu, 1 Jun 2017 21:29:35 +0000 (21:29 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev am:
7a148b9e09
am:
752b18191b -s ours
Change-Id: I05c487d4a8fc39944065a7f305afb87128e25400
Matthew Fritze [Thu, 1 Jun 2017 21:24:36 +0000 (21:24 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev
am:
7a148b9e09
Change-Id: I9ea047489b44bc538033343a6350a5abb8afef63
TreeHugger Robot [Thu, 1 Jun 2017 21:12:10 +0000 (21:12 +0000)]
Merge "Prevent crash when removing duplicates" into oc-dev
Alison Cichowlas [Tue, 30 May 2017 12:48:59 +0000 (08:48 -0400)]
Add group name into channel summary, if applicable.
Bug:
36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.
Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
Fan Zhang [Thu, 1 Jun 2017 20:34:53 +0000 (20:34 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev am:
e12790e34f
am:
7d190dd69d -s ours
Change-Id: Ib535478ef6de2a75d8675553d0f350f636d12e63
Andrew Sapperstein [Thu, 1 Jun 2017 20:28:37 +0000 (20:28 +0000)]
Merge "Initial search bar implementation." into oc-dev am:
91fe76263f
am:
9448f68171 -s ours
Change-Id: I45f0f3381052d2a57612134cf0ffe45711f50311
Fan Zhang [Thu, 1 Jun 2017 20:28:34 +0000 (20:28 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
am:
e12790e34f
Change-Id: I4a5223a27c98f7ae9422fb017f4206721080890a
TreeHugger Robot [Thu, 1 Jun 2017 20:24:05 +0000 (20:24 +0000)]
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 20:16:41 +0000 (20:16 +0000)]
Merge "Move BatteryInfo to settings from settingslib"
xudiwen [Thu, 1 Jun 2017 20:02:14 +0000 (20:02 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01 am:
957c4d7720 am:
0ff0487b51
am:
ecfbe17684
Change-Id: I0ecfb03dfdc7cafeb82a771ff87a33bf0408b961
Andrew Sapperstein [Thu, 1 Jun 2017 20:01:49 +0000 (20:01 +0000)]
Merge "Initial search bar implementation." into oc-dev
am:
91fe76263f
Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
jackqdyulei [Thu, 1 Jun 2017 20:01:42 +0000 (20:01 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev am:
d4991dc24d
am:
42790ccd84 -s ours
Change-Id: I09c4fdc402133470177817ca4fd713c372be2015
TreeHugger Robot [Thu, 1 Jun 2017 19:57:19 +0000 (19:57 +0000)]
Merge "Add search bar to SearchActivity."
Andrew Sapperstein [Thu, 1 Jun 2017 19:52:06 +0000 (19:52 +0000)]
Merge "Initial search bar implementation." into oc-dev
Fan Zhang [Thu, 1 Jun 2017 19:23:11 +0000 (12:23 -0700)]
Hide saved network preference when there is none.
We already do this when wifi is enabled. This change brings same
behavior when wifi is off.
Change-Id: I44301fe46a6183735f8be71c80cfe719ad0e82b4
Fix:
62094681
Test: runtest --path tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
TreeHugger Robot [Thu, 1 Jun 2017 19:33:27 +0000 (19:33 +0000)]
Merge "Pass component name into SuggestionFeatureProvider"
xudiwen [Thu, 1 Jun 2017 19:09:25 +0000 (19:09 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01 am:
957c4d7720
am:
0ff0487b51
Change-Id: I22cd436533a745a415a49122fe2469ef9a96cdc9
jackqdyulei [Thu, 1 Jun 2017 19:05:44 +0000 (19:05 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
am:
d4991dc24d
Change-Id: I4d8bd3099f493497adeb9afe42395225d7fb949c
xudiwen [Thu, 1 Jun 2017 19:05:23 +0000 (19:05 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings" am:
2c8d826b01
am:
957c4d7720
Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
TreeHugger Robot [Thu, 1 Jun 2017 19:04:06 +0000 (19:04 +0000)]
Merge "Bluetooth string changes"
xudiwen [Thu, 1 Jun 2017 19:01:50 +0000 (19:01 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
am:
2c8d826b01
Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
TreeHugger Robot [Thu, 1 Jun 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
Treehugger Robot [Thu, 1 Jun 2017 18:51:43 +0000 (18:51 +0000)]
Merge "NullPointerException when running monkey test in IccLockSettings"
Salvador Martinez [Thu, 1 Jun 2017 00:18:23 +0000 (17:18 -0700)]
Move BatteryInfo to settings from settingslib
This CL simply moves BatteryInfo from settingslib to settings and
makes sure the tests still pass. No other changes are made other than
imports or minor changes needed to make sure existing code does not
break.
Test: Robotests still pass
Bug:
38399275
Bug:
38398949
Bug:
38399654
Change-Id: I59803348e2780b7676ccc6c43234a586c184d71f
jackqdyulei [Wed, 31 May 2017 17:22:11 +0000 (10:22 -0700)]
Don't index High usage summary
Because the strings inside are dynamic
Bug:
62069270
Test: RunSettingsRoboTests still pass
Change-Id: I744179bef89cfaff403f9ce65fcfc0f03c04350b
jackqdyulei [Tue, 30 May 2017 21:54:52 +0000 (14:54 -0700)]
Update strings for anomaly detection
Bug:
62069270
Test: Build
Change-Id: I7f5a00cfd39d85a08054e334ace76ebf7898850c
Matthew Fritze [Tue, 30 May 2017 15:36:52 +0000 (08:36 -0700)]
Prevent crash when removing duplicates
The method that crashes is removed in O-DR, and thus
does not need to be merged down.
Change-Id: If30bd8bd92d578133984f7f35e7ec5288adfc390
Fixes:
62100634
Test: make RunSettingsRoboTests
Merged-In: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: I4a0f0c91c51ff5820b61a596520d80a3337c3466
Daniel Nishi [Thu, 1 Jun 2017 17:48:41 +0000 (17:48 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev am:
7035a41715
am:
0a8b12a30a
Change-Id: I3f17e10a9aaf011aee587dbe0e36d18a3a27c42f
Daniel Nishi [Thu, 1 Jun 2017 17:42:55 +0000 (17:42 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
am:
7035a41715
Change-Id: I2c465b9561cea69e5772efd08af7794f762758ca
Daniel Nishi [Thu, 1 Jun 2017 17:30:32 +0000 (17:30 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
Antony Sargent [Thu, 1 Jun 2017 04:23:30 +0000 (21:23 -0700)]
Bluetooth string changes
This includes:
-Title string for device details page
-MAC address string for device details page
Bug:
35876580
Test: make RunSettingsRoboTests
Change-Id: I360996915d1dfa59bbb12f33f42afc4aa0bde64b
TreeHugger Robot [Thu, 1 Jun 2017 17:03:04 +0000 (17:03 +0000)]
Merge "Add search index for support dashboard activity."
Alison Cichowlas [Wed, 31 May 2017 21:01:24 +0000 (17:01 -0400)]
Disallow buzz/beep/disturb changes for notifications with locked importance.
If mAppRow.lockedImportance (which comes from the whitelist config_nonBlockableNotificationPackages), don't allow sound, vibration, or override dnd to be changed.
Bug:
38480212
Test: manually verified for now
Change-Id: I04aa7f15f2480472ec6ee487472098e81ab3d99f
Esteban Talavera [Tue, 30 May 2017 15:48:08 +0000 (16:48 +0100)]
Include disabled managed profiles in Accounts page
At the moment we include disabled profiles when deciding
whether the Work section needs to be added, and then only
include enabled ones when searching for the managed profile's
user handle
Change-Id: I96b0c36aad6b9326abc2992fa3309716f5cd1e74
Fix:
62021410
Test: m RunSettingsRoboTests
TreeHugger Robot [Thu, 1 Jun 2017 08:40:39 +0000 (08:40 +0000)]
Merge "Use a common style for custom preference icon layouts"
Kevin Chyn [Thu, 1 Jun 2017 08:25:07 +0000 (08:25 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev am:
98b67a4e94
am:
618467daff
Change-Id: I78b14e932635fd316fa96fc2cfadcdf9567e724c
Kevin Chyn [Thu, 1 Jun 2017 08:17:06 +0000 (08:17 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
am:
98b67a4e94
Change-Id: Ic3497ccbd63ba4e56ad1923f6b4d082e78c95b70
TreeHugger Robot [Thu, 1 Jun 2017 08:09:51 +0000 (08:09 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 07:25:58 +0000 (07:25 +0000)]
Merge "Update bluetooth strings"
TreeHugger Robot [Thu, 1 Jun 2017 07:11:36 +0000 (07:11 +0000)]
Merge "Add method to calculate last full charge time"
TreeHugger Robot [Thu, 1 Jun 2017 06:45:13 +0000 (06:45 +0000)]
Merge "Remove night display headers and change strings"
TreeHugger Robot [Thu, 1 Jun 2017 06:43:21 +0000 (06:43 +0000)]
Merge "Initial search bar implementation."
Daniel Sheng [Thu, 1 Jun 2017 05:39:00 +0000 (05:39 +0000)]
Merge "Added strings for gesture suggestions"
Lorenzo Colitti [Tue, 2 May 2017 03:06:32 +0000 (12:06 +0900)]
Reduce jank in the wifi detail status page.
Currently, when anything changes, the wifi detail status page
removes and then redraws all IP address information. This causes
the whole screen to flicker. Instead, only add and remove things
when they actually change.
In order to do this, convert the IPv6 addresses from a list of
Preference objects to a single newline-separated text field.
This removes the need to keep track of addresses as they are
added and deleted, and also looks a bit better.
Also, minor correctness fixes:
- Get the gateway from the default route, not from the last route
with a non-null gateway.
- Get the IPv4 subnet mask from the IPv4 address prefix, not from
the last route with prefix length > 0.
Bug:
62171690
Test: make -j64 RunSettingsRoboTests
Test: IP information does not flicker when signal strength changes
Change-Id: Ia9f2a277e53a2800407ae327701c5b95a9eec20a
Kevin Chyn [Thu, 1 Jun 2017 00:11:03 +0000 (17:11 -0700)]
Add onResume to FingerprintEnrollEnrolling
Fixes:
62233947
Test: revoke usb permissions, start enrolling, attach usb,
press ok, continue enroll. enroll should be able to continue
and complete
onPause was added in b/
38102355, but onResume was not added. We should
set the listener in onResume()
Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
Fan Zhang [Wed, 31 May 2017 22:40:02 +0000 (15:40 -0700)]
Use a common style for custom preference icon layouts
Change-Id: Ief3bc54f700cb891041adf92846149c6f41caad0
Fix:
35961001
Test: instrumentation test
jackqdyulei [Wed, 31 May 2017 23:17:51 +0000 (16:17 -0700)]
Update bluetooth strings
Update based on new change in doc:
1. revert "visible as" string
2. change "device mac" string
Bug:
35876580
Test: RunSettingsRoboTests
Change-Id: I8950ed3e2e9c000ab25ea0a3d0d15f69fc075fda
Christine Franks [Wed, 31 May 2017 22:54:31 +0000 (22:54 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev am:
9ef166a578
am:
d974ccb625
Change-Id: I8d693fd2d41f73b53416ee83d7b289496765c660
Matthew Fritze [Wed, 31 May 2017 22:52:58 +0000 (22:52 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev am:
564d90faf0
am:
6a50c4555c
Change-Id: Iaf810111f5c4d5e820a0d336eb3029b9474757f3
Christine Franks [Wed, 31 May 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
am:
9ef166a578
Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992
Doris Ling [Wed, 31 May 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add new strings to highlight gestures in settings."
Christine Franks [Wed, 31 May 2017 22:47:42 +0000 (22:47 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
Matthew Fritze [Wed, 31 May 2017 22:47:27 +0000 (22:47 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
am:
564d90faf0
Change-Id: I91993bdbf7de1256fb8149478126ec507833611b