OSDN Git Service
Hiroki Yamamoto [Tue, 6 Jun 2017 19:34:49 +0000 (19:34 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041 am:
56a8267f59
am:
77452b8a57
Change-Id: I19237cb1f24dc1f0b127b2bd2476ee1f3a28b0bb
Hiroki Yamamoto [Tue, 6 Jun 2017 19:28:41 +0000 (19:28 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041
am:
56a8267f59
Change-Id: Idca7ade0068f390289c7c13d1765fead6e0e1d35
Hiroki Yamamoto [Tue, 6 Jun 2017 19:22:09 +0000 (19:22 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
am:
e990bf3041
Change-Id: I2b2978a82a9dbee948b4e50f2b85978b9ddb58e5
Treehugger Robot [Tue, 6 Jun 2017 19:12:53 +0000 (19:12 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
Andrew Sapperstein [Tue, 6 Jun 2017 19:10:43 +0000 (19:10 +0000)]
Merge "Revert "Initial search bar implementation."" into oc-dev
am:
dfc1983601
Change-Id: I6c143b18b53857accac23d7c64f807c6987609a5
TreeHugger Robot [Tue, 6 Jun 2017 19:04:25 +0000 (19:04 +0000)]
Merge "Revert "Initial search bar implementation."" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 19:00:29 +0000 (19:00 +0000)]
Merge "Check for dynamic summaries at display time for search" into oc-dev
am:
2046c59b77
Change-Id: I549f1aa455ffbff0119dd00ef782710992100cce
Andrew Sapperstein [Tue, 6 Jun 2017 19:00:04 +0000 (19:00 +0000)]
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
am:
37f87b6c64
Change-Id: Icbdb586e3e1a35c004298f50a57812e50ee73eea
TreeHugger Robot [Tue, 6 Jun 2017 18:52:30 +0000 (18:52 +0000)]
Merge "Check for dynamic summaries at display time for search" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 18:42:24 +0000 (18:42 +0000)]
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 17:58:30 +0000 (17:58 +0000)]
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
am:
b8028f63ec
Change-Id: I47066c45b6ee286a2f1eac5ba1d57a5de058652c
TreeHugger Robot [Tue, 6 Jun 2017 17:44:21 +0000 (17:44 +0000)]
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
Daniel Nishi [Tue, 6 Jun 2017 17:40:04 +0000 (17:40 +0000)]
Merge "Band aid to fix overly long text in donut." into oc-dev
am:
b5abb2c1d2
Change-Id: I8bd8b052cd8c437dd858a459c8098e39878b4b50
Matthew Fritze [Tue, 6 Jun 2017 17:34:31 +0000 (17:34 +0000)]
Merge "Update the no-results icon in settings search" into oc-dev
am:
02e360dbc9
Change-Id: Ic77a5d965bfb882d128182f3eaff5e0c857dd500
Daniel Nishi [Tue, 6 Jun 2017 17:33:55 +0000 (17:33 +0000)]
Merge "Band aid to fix overly long text in donut." into oc-dev
Andrew Sapperstein [Tue, 6 Jun 2017 16:33:27 +0000 (16:33 +0000)]
Revert "Initial search bar implementation."
This reverts commit
14934599dd6008a79c5e0d67f1df9ba5886c5198.
Bug:
37477506
Change-Id: I510b9a71dd3f19a3d2194da1f4d8f8060d0a4935
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Andrew Sapperstein [Tue, 6 Jun 2017 16:33:13 +0000 (16:33 +0000)]
Revert "Add search bar to SearchActivity."
This reverts commit
fac61b71e5b32bf8cd464049c2750a18911b75b2.
Bug:
37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
TreeHugger Robot [Tue, 6 Jun 2017 17:25:56 +0000 (17:25 +0000)]
Merge "Update the no-results icon in settings search" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 01:02:19 +0000 (01:02 +0000)]
Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
This reverts commit
c1e9f8787f02df0d38a9d4e93f7996318fc46355.
Reason for revert: There is an issue when dropdown menu text has a '%' sign in it.
Despite testing it on my own devices, the bug did not show up immediately.
Instead of continuing down this path for OC, we'll just revert
this patch, and then as an ugly, band-aid solution, check the
summary text for the "%s" substring, and hide it when found.
In O-DR onward, we'll look for a more permanent solution.
Change-Id: Ia7a04bfb7b09c436dc0f13564f2134a1f0c436e2
Bug:
36101902
Fix:
62211676
Bill Yi [Tue, 6 Jun 2017 16:28:22 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
11465af11e -s ours
Change-Id: I398b4773e26cb34a1ce6304d91b52df32a11e821
TreeHugger Robot [Tue, 6 Jun 2017 16:17:42 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 02:08:14 +0000 (19:08 -0700)]
Check for dynamic summaries at display time for search
In order to hide dynamic summaries which use SettingPref,
we check if the summary is equal to "%s".
This is a temporary, band-aid fix which should be
changed in the next release.
Bug:
36101902
Test: make RunSettingsRoboTests
Change-Id: I6cadb3ba68f09ba18ad9a6d2a817804c5d4a08e5
Hiroki Yamamoto [Tue, 6 Jun 2017 11:05:00 +0000 (20:05 +0900)]
NFC: Reset Tap&pay summary text if default payment is not set
Reset Tap&pay summary text even default payment is null
to show the correct status that is no payment service.
Test: manual
Bug:
62366917
Change-Id: Ida9cf0b205e56163505862498b1ac4d679c2c92a
Salvador Martinez [Tue, 6 Jun 2017 04:35:19 +0000 (04:35 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
am:
a8e887be86
Change-Id: I561cd90ba74a551a44d43a04a1b567efc74e4863
Salvador Martinez [Tue, 6 Jun 2017 04:29:31 +0000 (04:29 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
Fan Zhang [Tue, 6 Jun 2017 04:07:52 +0000 (04:07 +0000)]
Revert "Remove dynamic summary from Security Patch info"
The change breaks build
Fix:
62359766
Bug:
36101902
This reverts commit
2b562f84b6c317711fdb70db5b4d3cb9953ed536.
Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
jackqdyulei [Tue, 6 Jun 2017 02:05:09 +0000 (02:05 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev
am:
8fbb0bc1f2
Change-Id: Idd493f97773816dc4cc1c759bc5465a2b7f4b04f
TreeHugger Robot [Tue, 6 Jun 2017 01:53:58 +0000 (01:53 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev
Lorenzo Colitti [Tue, 6 Jun 2017 01:27:32 +0000 (01:27 +0000)]
Merge changes I23540440,I67269e1a into oc-dev
am:
4249a7092b
Change-Id: Ic8383cce733c5767b133af0e9f85e213e0c36018
Lorenzo Colitti [Tue, 6 Jun 2017 01:22:07 +0000 (01:22 +0000)]
Merge changes I23540440,I67269e1a into oc-dev
* changes:
When validation state changes, update the AP summary.
Minor tweaks to WifiDetailPreferenceControllerTest.
Doris Ling [Tue, 6 Jun 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Also update flip camera settings for managed profile." into oc-dev
am:
051a83d909
Change-Id: I4ba1750948815233ef6a963ddde1ca0bd33bcdec
Doris Ling [Tue, 6 Jun 2017 01:15:10 +0000 (01:15 +0000)]
Remove call to WifiManager.setWifiApEnabled().
am:
f38ed2fbb2
Change-Id: I255679d0eaeaa94d2ac6e5caddf4c6f5a5581bc1
TreeHugger Robot [Tue, 6 Jun 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Also update flip camera settings for managed profile." into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 00:53:14 +0000 (17:53 -0700)]
Update the no-results icon in settings search
Bug:
36597112
Test: Open settings, search for 'battle toads', and see the no results icon
Change-Id: I7196114ecaf733747237202d30dd1b47ad37d97e
Doris Ling [Mon, 5 Jun 2017 21:48:44 +0000 (14:48 -0700)]
Also update flip camera settings for managed profile.
When user update the setting for flip camera, check if there is managed
profile for the user, and update the setting for the managed user id as
well, so that the work profile camera app can read the correct setting
value.
Change-Id: I757041289329870311bc8473b19fd49ecdd0fadb
Fix:
62078588
Test: make RunSettingsRoboTests
Doris Ling [Fri, 2 Jun 2017 00:06:40 +0000 (17:06 -0700)]
Remove call to WifiManager.setWifiApEnabled().
- replace it with ConnectivityManager.stopTethering() instead.
Change-Id: I112863b1be37c0fef5d59c16d73f0c6cf71c6dea
Fix:
62191978
Test: make RunSettingsRoboTests
Daniel Nishi [Wed, 24 May 2017 23:25:08 +0000 (16:25 -0700)]
Band aid to fix overly long text in donut.
In the Storage Settings, if the text is too long, it will overlap with
the donut. After discussing with UX, we've opted to shrink the text in
the extenuating circumstances. This is because this text is more of a
helper and the full information is on the left.
Bug:
38030457
Test: Manual with Telugu
Change-Id: I18bcaaae74d049c42eaff50868d3861ae258839d
jackqdyulei [Mon, 5 Jun 2017 17:44:34 +0000 (10:44 -0700)]
Make footer preferences non-clickable by default
cherry-picked from ag/
2301717
Both the footer preference and the TextView they contain
were clickable, which confused some accessibility services.
Bug:
62050563
Test: Verified that switch access no longer offers users
the option of clicking on the footer for accessibility
services and Magnification as well as in the Battery
settings screen.
Change-Id: I5cb13d6268466c690dd38f2b652422d2c3d813b4
Merged-In: I937340fda93f6a8097919e1f86d5d890487370bc
Lorenzo Colitti [Fri, 2 Jun 2017 09:00:40 +0000 (18:00 +0900)]
When validation state changes, update the AP summary.
This stops the AP summary from getting stuck on "Connected, no
Internet" even when the system has validated Internet access.
Bug:
62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: I235404408f7d8b958653d25656d97da8206e35ce
Thecrazyskull [Sun, 4 Jun 2017 00:04:25 +0000 (00:04 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1 am:
6270dce2cd
am:
7151be926d
Change-Id: I16805427f0d053c6d1c5975275f00cb0ed1c9cbb
Thecrazyskull [Sun, 4 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1
am:
6270dce2cd
Change-Id: Ie8ce734935d9950c515675710772aa5f3c80c988
Thecrazyskull [Sat, 3 Jun 2017 23:55:52 +0000 (23:55 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
am:
46f7199cb1
Change-Id: Ifd9394c6da48a88ddb6f59ead3db1c93519a70ac
Treehugger Robot [Sat, 3 Jun 2017 23:49:37 +0000 (23:49 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
Mikhail Malakhov [Sat, 3 Jun 2017 22:24:50 +0000 (22:24 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a am:
933cdd5503
am:
0730393097
Change-Id: Ia65d7c966350dac44a1d15a5781d051df8d464cd
Mikhail Malakhov [Sat, 3 Jun 2017 22:20:48 +0000 (22:20 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a
am:
933cdd5503
Change-Id: I0fbdadf1b42543936f3ed657b52da23978a0fe16
Mikhail Malakhov [Sat, 3 Jun 2017 22:16:48 +0000 (22:16 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
am:
c7697e9b8a
Change-Id: Ic9bdabec50ba8b72656c0d5fc0b56551ad3a46cb
Treehugger Robot [Sat, 3 Jun 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
Tony Mantler [Sat, 3 Jun 2017 22:00:17 +0000 (22:00 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am:
685041559a
Change-Id: I9ff3757e28b82caac7d83394f3734eee040a7b00
TreeHugger Robot [Sat, 3 Jun 2017 21:40:51 +0000 (21:40 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
Bill Yi [Sat, 3 Jun 2017 18:42:52 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2484f37f3299006a02b28681ccd1be87123dba7b
Auto-generated-cl: translation import
Thecrazyskull [Thu, 2 Mar 2017 19:55:59 +0000 (14:55 -0500)]
ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition
Test: none
Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
Tony Mantler [Fri, 26 May 2017 20:34:14 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
Peter Qiu [Fri, 2 Jun 2017 20:38:58 +0000 (20:38 +0000)]
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
am:
7eeca4b052
Change-Id: I5a8daed2e821623aaa953ccf256808776f7febdd
TreeHugger Robot [Fri, 2 Jun 2017 20:25:12 +0000 (20:25 +0000)]
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
Lei Yu [Fri, 2 Jun 2017 19:29:09 +0000 (19:29 +0000)]
Merge "Restart loader in onResume" into oc-dev
am:
74ca6aa060
Change-Id: I4cc76a8eeee55335bd6a4ab7d6870084ec609f9b
Lei Yu [Fri, 2 Jun 2017 19:21:27 +0000 (19:21 +0000)]
Merge "Restart loader in onResume" into oc-dev
Alison Cichowlas [Fri, 2 Jun 2017 18:49:29 +0000 (18:49 +0000)]
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
am:
e811873b4e
Change-Id: Ia4def66e47faf702c22a4e3aba04d52965052aa8
TreeHugger Robot [Fri, 2 Jun 2017 18:42:24 +0000 (18:42 +0000)]
Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
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
Merged-In: I6f7e1b57b945c92d34587ca24db192600e7f797f
Peter Qiu [Wed, 31 May 2017 17:19:42 +0000 (10:19 -0700)]
wifi: use WifiSavedConfigUtils to retrieve saved configurations
Bug:
62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
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 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 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: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
Lorenzo Colitti [Fri, 2 Jun 2017 08:55:55 +0000 (17:55 +0900)]
Minor tweaks to WifiDetailPreferenceControllerTest.
Add makeNetworkCapabilities and updateNetworkCapabilities
methods, and use them. These are not very useful in the current
code but we introduce in their own CL to limit test changes in an
upcoming CL that will make use them to test new code.
Bug:
62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: I67269e1add40ecb3c2b693548e8bf29ae776a79f
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: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:29:05 +0000 (04:29 +0000)]
Volume can not be updated in Sound¬ification
am:
8c329af634
Change-Id: I8031a9bbe82b40e79698e9d6be75bcd85bcde028
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"
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
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
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
Mikhail Malakhov [Thu, 20 Oct 2016 19:45:18 +0000 (22:45 +0300)]
Sometime, Settings app crash when AllowBindAppWidgetActivity closing
Process: com.android.settings
E AndroidRuntime: java.lang.RuntimeException:
Unable to destroy activity {com.android.settings/
com.android.settings.AllowBindAppWidgetActivity}:
java.lang.IllegalArgumentException: Receiver not registered:
android.app.Activity$1@
5817135
Change-Id: I0f8b61f4c1772b43bffd949928ccaafd295f5fac
Signed-off-by: Mikhail Malakhov <malakhv@gmail.com>
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
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
Alison Cichowlas [Thu, 1 Jun 2017 20:07:32 +0000 (16:07 -0400)]
Delay adding app settings link until data fetch returns,
to avoid reordering/visible misplaced "additional settings
in the app" during transition.
Bug:
62051521
Test: manual with transition scale turned to 10x sloooow.
Change-Id: I50666fbcb2a14344bbdbb2f4347c8470edb96619
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
Andrew Sapperstein [Thu, 1 Jun 2017 19:52:06 +0000 (19:52 +0000)]
Merge "Initial search bar implementation." into oc-dev
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
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"
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
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