OSDN Git Service
Fan Zhang [Mon, 8 May 2017 16:31:01 +0000 (09:31 -0700)]
Add support to show first impression type suggestions
- Add FIRST_IMPRESSION type in suggestion order list.
- Make rule changes for a few suggestions.
Bug:
37947647
Test: manual
Change-Id: I2101f5e0f6424723bacc9f5febf2ffaab9398896
Fan Zhang [Mon, 8 May 2017 23:15:04 +0000 (23:15 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am:
2dbc30dc58
am:
df2ecdf3f0
Change-Id: Ie616f506702d2732d62b8a2ea02a4b7d52bdf0eb
Fan Zhang [Mon, 8 May 2017 23:08:31 +0000 (23:08 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
am:
2dbc30dc58
Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
TreeHugger Robot [Mon, 8 May 2017 22:58:55 +0000 (22:58 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
Matthew Fritze [Mon, 8 May 2017 22:56:50 +0000 (22:56 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev am:
fc8e64eccb
am:
43171ef58a -s ours
Change-Id: I9b250e7420e2bf143a69c9a54f340bed040cc32b
Stephen Chen [Mon, 8 May 2017 22:56:17 +0000 (22:56 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev am:
f7980fc3cb
am:
95640767d1
Change-Id: I5b4374a51dfa73b3a8b17bad0a6de473a6808627
Doris Ling [Mon, 8 May 2017 22:55:50 +0000 (22:55 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev am:
a3c4339299
am:
06b670e4df
Change-Id: I1746fbdfeea5a1f807bfe3b7bf7b5847a298aa2e
TreeHugger Robot [Mon, 8 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Update some rules for suggestions"
TreeHugger Robot [Mon, 8 May 2017 22:14:19 +0000 (22:14 +0000)]
Merge "Create RestrictedDashboardFragment."
Matthew Fritze [Mon, 8 May 2017 21:05:20 +0000 (21:05 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev
am:
fc8e64eccb
Change-Id: I4cb1f8685c5d1f43aa5ce5b5b5e124d1240e43bd
Stephen Chen [Mon, 8 May 2017 21:04:55 +0000 (21:04 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
am:
f7980fc3cb
Change-Id: I0b9866922e764afba8f0b642fa16531cd48b73c0
Doris Ling [Mon, 8 May 2017 21:04:28 +0000 (21:04 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev
am:
a3c4339299
Change-Id: Ia9ab661f1e870764c8e13c945389d734cbee14d4
Fan Zhang [Mon, 8 May 2017 20:54:19 +0000 (13:54 -0700)]
Update some rules for suggestions
Bug:
37947647
Test: rerun settingslib/settings robotests
Change-Id: Ie5278a2cb86c4d2dd7568b9c800db461ee3c1f04
TreeHugger Robot [Mon, 8 May 2017 20:51:03 +0000 (20:51 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:44:11 +0000 (20:44 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev
jackqdyulei [Fri, 5 May 2017 23:07:48 +0000 (16:07 -0700)]
Create RestrictedDashboardFragment.
RestrictedDashboardFragment has all the same logic coming from
RestrcitedSettingsFragment but extends from DashboardFragment.
As a result, we could use preferenceController in child class of
RestrictedDashboardFragment.
This cl also make DeviceListPreferenceFragment as child of
RestrictedDashboardFragment, which enfluences the bluetooth page.
Bug:
38041586
Test: Build
Change-Id: I01395d506176c5cc584948478f7ca16c1c7c7045
Fan Zhang [Fri, 5 May 2017 16:19:13 +0000 (09:19 -0700)]
Fix PrefCategory layout to align text with actionbar title
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix:
38011653
Test: visual
Fan Zhang [Mon, 8 May 2017 19:14:59 +0000 (19:14 +0000)]
Merge "Remove summary template in sleep timeout setting." into oc-dev am:
014ff46fa6
am:
f7ba1e7209
Change-Id: I867a5237475be372bcc183b038c9539a3c4a8087
Svetoslav Ganov [Mon, 8 May 2017 19:14:28 +0000 (19:14 +0000)]
Merge "Report normalized package name as default key" into oc-dev am:
0560127e9d
am:
bf3ad99a38
Change-Id: Id4d90c665262151bc4413a8143cd131c1d069543
Fan Zhang [Mon, 8 May 2017 19:08:20 +0000 (19:08 +0000)]
Merge "Remove summary template in sleep timeout setting." into oc-dev
am:
014ff46fa6
Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
Svetoslav Ganov [Mon, 8 May 2017 19:07:55 +0000 (19:07 +0000)]
Merge "Report normalized package name as default key" into oc-dev
am:
0560127e9d
Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265
TreeHugger Robot [Mon, 8 May 2017 18:57:56 +0000 (18:57 +0000)]
Merge "Remove summary template in sleep timeout setting." into oc-dev
Svetoslav Ganov [Mon, 8 May 2017 18:57:22 +0000 (18:57 +0000)]
Merge "Report normalized package name as default key" into oc-dev
Svet Ganov [Sat, 6 May 2017 22:49:27 +0000 (15:49 -0700)]
Report normalized package name as default key
Test: make RunSettingsRoboTests -j90
bug:
36978445
Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
Matthew Fritze [Tue, 25 Apr 2017 16:38:56 +0000 (09:38 -0700)]
Prevent race conditions after dropping database
Block all loaders from accessing the database
before indexing is complete.
Bug:
37501479
Test: make RunSettingsRoboTests
Change-Id: I2af98dcf6bceacbeffa70bd40879c97bb0cbc828
Merged-In: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
TreeHugger Robot [Mon, 8 May 2017 18:22:27 +0000 (18:22 +0000)]
Merge "Use a SwitchPreference for auto-rotate instead"
Daniel Sheng [Mon, 8 May 2017 18:07:03 +0000 (18:07 +0000)]
Merge "Camera lift preference now saves correctly"
TreeHugger Robot [Mon, 8 May 2017 17:31:08 +0000 (17:31 +0000)]
Merge "Use framework pref layout for SwitchPreference"
Amin Shaikh [Mon, 8 May 2017 17:14:51 +0000 (17:14 +0000)]
Merge "Show "Forget" button for ephemeral networks." into oc-dev am:
3f303d5fd8
am:
293a0f003a
Change-Id: Id7c648e3d3b80ff1e983f992c553ef81df964b99
Amin Shaikh [Mon, 8 May 2017 17:11:48 +0000 (17:11 +0000)]
Merge "Show "Forget" button for ephemeral networks." into oc-dev
am:
3f303d5fd8
Change-Id: Ic8c5028ac48b36a03871423cb867518fd5d38dc4
TreeHugger Robot [Mon, 8 May 2017 17:07:32 +0000 (17:07 +0000)]
Merge "Show "Forget" button for ephemeral networks." into oc-dev
Daniel Nishi [Mon, 8 May 2017 16:53:21 +0000 (16:53 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev am:
816956d249
am:
bc628dfdd9
Change-Id: I47b9bd56c6a7bb6f2a640ae067623a4f5395d455
Daniel Nishi [Mon, 8 May 2017 16:50:17 +0000 (16:50 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev
am:
816956d249
Change-Id: I3bd38a5cd716df4d4c91ab762870ad74c626de6d
Daniel Nishi [Mon, 8 May 2017 16:45:06 +0000 (16:45 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev
Fan Zhang [Sat, 6 May 2017 00:38:50 +0000 (17:38 -0700)]
Use a SwitchPreference for auto-rotate instead
- Change the UI to SwitchPreference
- Remove old string used by DropDownPreference
- Attach listener to monitor setting change
Change-Id: If42cceb74296814311eb0eff8e26b4a48a1c4d29
Fix:
35959797
Test: robotests
Fan Zhang [Sat, 6 May 2017 01:03:08 +0000 (18:03 -0700)]
Use framework pref layout for SwitchPreference
Test: manual
Change-Id: Id9add8d5669cbb34e93c9bfd2e25e75d9cc56a56
nharold [Sat, 6 May 2017 03:26:23 +0000 (03:26 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1 am:
98f209c6e5 am:
2e4950879a
am:
d460c1a6b3
Change-Id: Icdb6c3cb600a65189ce0e7f7dd27a9fe975feb8e
nharold [Sat, 6 May 2017 02:55:47 +0000 (02:55 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1 am:
98f209c6e5
am:
2e4950879a
Change-Id: I656450f32a00f9a761a6d0069d2f3c59b729e0f5
Fan Zhang [Sat, 6 May 2017 02:48:38 +0000 (02:48 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev am:
4f5b13f97a
am:
779548122b
Change-Id: Ie1f2b075461dc0546cb1cfe2149cbda6254a33af
Fan Zhang [Sat, 6 May 2017 02:46:38 +0000 (02:46 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
am:
4f5b13f97a
Change-Id: I7166624e96ed82f523545f390457661dfb7c3d42
TreeHugger Robot [Sat, 6 May 2017 02:42:37 +0000 (02:42 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
nharold [Sat, 6 May 2017 02:07:30 +0000 (02:07 +0000)]
Merge "Update references to use PhoneConstantConversion" am:
79694e79d1
am:
98f209c6e5
Change-Id: I5c7760471d2e48df20955122507b503ca546954e
nharold [Sat, 6 May 2017 01:57:56 +0000 (01:57 +0000)]
Merge "Update references to use PhoneConstantConversion"
am:
79694e79d1
Change-Id: I809133a80c00b932b00637920f2c4c89a5a69a22
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge "Update references to use PhoneConstantConversion"
Roozbeh Pournader [Sat, 6 May 2017 01:41:43 +0000 (01:41 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev am:
869d246021
am:
6b06aa1099
Change-Id: I3db0d2e88659b4cd1822a368845b9179521a69e6
Roozbeh Pournader [Sat, 6 May 2017 01:39:29 +0000 (01:39 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
am:
869d246021
Change-Id: Idb17d5f38526c926ddf2d0ca55d30f806c52d574
TreeHugger Robot [Sat, 6 May 2017 01:34:46 +0000 (01:34 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
Fan Zhang [Fri, 5 May 2017 22:03:19 +0000 (15:03 -0700)]
Fix crash when there is no emergencybroadcast app on device
Some devices do not have emergencybroadcast app installed, so we should
not show the preference item for it. Add the preference controller into
AppAndNotificationFragment properly hides it.
Change-Id: Ic39ba24da9bd8f3200a5e44232a5489e35c48c0a
Fix:
37945069
Test: make RunSettingsRoboTests
TreeHugger Robot [Sat, 6 May 2017 00:37:08 +0000 (00:37 +0000)]
Merge "Prevent race conditions after dropping database"
Doris Ling [Sat, 6 May 2017 00:11:39 +0000 (00:11 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev am:
f9d9524574
am:
7c5ef68505
Change-Id: Ia7956ad53ecb8aed962f2d0f3950243ab4c6b06e
Doris Ling [Sat, 6 May 2017 00:02:54 +0000 (00:02 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
am:
f9d9524574
Change-Id: I8b02370267e682ec17efcdf877c960e4189304ae
TreeHugger Robot [Fri, 5 May 2017 23:59:27 +0000 (23:59 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
Fan Zhang [Fri, 5 May 2017 22:54:11 +0000 (22:54 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev am:
fe5d64feb0
am:
12cc6aad3c
Change-Id: If61ae23a8a908452f26c07c7908d1cdd365feb4a
Matthew Fritze [Tue, 25 Apr 2017 16:38:56 +0000 (09:38 -0700)]
Prevent race conditions after dropping database
Manual merge from: ag/
2155898
Bug:
37501479
Test: make RunSettingsRoboTests
Change-Id: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
TreeHugger Robot [Fri, 5 May 2017 22:27:55 +0000 (22:27 +0000)]
Merge "Tether screen cleanup"
Fan Zhang [Fri, 5 May 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev
am:
fe5d64feb0
Change-Id: I3bfc37b5bcdcf562faf2c528048e0a5c9427a8f2
Doris Ling [Wed, 3 May 2017 23:22:40 +0000 (16:22 -0700)]
Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check
the app permission info, check for null package info and only process
the permission info when package info is available.
- Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to
PackageManager.MATCH_ANY_USER, as the implementation for querying
packages for other users have been changed.
- Add PackageManager APIs used by AppStateAppOpsBridge to
IPackageManagerWrapper for test purpose.
- Change UserManager.get() to Context.getSystemService() to fix test
failure.
Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61
Fix:
37409266
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 5 May 2017 21:52:06 +0000 (21:52 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev
Suprabh Shukla [Fri, 5 May 2017 21:02:10 +0000 (21:02 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev am:
43083b4332
am:
3cadb80e8d
Change-Id: I6503c03ce91af9c3059135160abcdebe8d6fd6b8
Suprabh Shukla [Fri, 5 May 2017 20:56:10 +0000 (20:56 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
am:
43083b4332
Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
TreeHugger Robot [Fri, 5 May 2017 20:48:41 +0000 (20:48 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:41:46 +0000 (20:41 +0000)]
Merge "Revert "Remove custom layout for expandpreference.""
Fan Zhang [Fri, 5 May 2017 17:19:52 +0000 (10:19 -0700)]
Remove summary template in sleep timeout setting.
The template causes incorrect display in search, and it's not
needded by anyone in code.
Bug:
36101902
Test: rerun robotests
Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3
Roozbeh Pournader [Fri, 5 May 2017 20:40:05 +0000 (13:40 -0700)]
Fix bidi direction of dialog and bidi-wrap service name
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.
Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.
Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes:
37761152
Fan Zhang [Thu, 4 May 2017 16:12:12 +0000 (09:12 -0700)]
Update tether summary text when airplane mode turns on
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix:
37934871
Test: make RunSettingsRoboTests
jackqdyulei [Fri, 5 May 2017 19:35:55 +0000 (19:35 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev am:
651261c7dd
am:
83e2511d45
Change-Id: I217d9f4a835f8352dcc7868067f09a5cd9b313ae
jackqdyulei [Fri, 5 May 2017 19:24:11 +0000 (19:24 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
am:
651261c7dd
Change-Id: I3c030efa5dc025dbeae7dfa059d58cd617f2691a
TreeHugger Robot [Fri, 5 May 2017 18:55:27 +0000 (18:55 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
TreeHugger Robot [Fri, 5 May 2017 18:36:40 +0000 (18:36 +0000)]
Merge "Change the logic for showing "App info" vs "show more""
TreeHugger Robot [Fri, 5 May 2017 18:02:27 +0000 (18:02 +0000)]
Merge "Misc string updates"
jackqdyulei [Thu, 4 May 2017 19:38:08 +0000 (12:38 -0700)]
Only use PROCESS_STATE_TOP as foreground time.
There are some miscalculations in state FOREGROUND_SERVICE and
FOREGROUND, so we move them out of the foreground time for now.
We will fix it after O and may add them back later.
Bug:
37000096
Test: RunSettingsRoboTests
Change-Id: Ic3f2f7fa69e8a213895c601630d1cca94fd32220
Fan Zhang [Fri, 5 May 2017 00:13:21 +0000 (17:13 -0700)]
Change the logic for showing "App info" vs "show more"
Fix:
33265548
Test: robotests
The old logic shows "show more" when there is any recent app, new logic
first checks if there is any displayable recent app. Otherwise go back
to display "app info".
Change-Id: I485725eaa025b9e2cfffc5e9e1923aa771bb0e12
Fan Zhang [Thu, 4 May 2017 22:32:34 +0000 (15:32 -0700)]
Misc string updates
- Use BidiFormat wrap dp number
- Update billing cycle starting day string
Change-Id: Ifb57e3bb18ced72f91f30599a2ff7bcfa329630f
Fix:
37353209
Fix:
37657115
Fix:
38005987
Test: visual
Fan Zhang [Fri, 5 May 2017 16:03:44 +0000 (16:03 +0000)]
Revert "Remove custom layout for expandpreference."
This reverts commit
403ff14638def53a0c9a8909a36645346c5cde85.
Change-Id: Ia13843842d147da0ff52b0898c39393d5a113f06
Bill Yi [Fri, 5 May 2017 12:23:47 +0000 (12:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
2dcbda8004 -s ours
am:
9330470b28 -s ours
Change-Id: I41ce102c1bf82edb4f1e7474fa62a2c3f849d255
Bill Yi [Fri, 5 May 2017 12:08:31 +0000 (12:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2dcbda8004 -s ours
Change-Id: I8b39a0a9c01fff1d44613e98a390d257e3f2f858
TreeHugger Robot [Fri, 5 May 2017 11:58:05 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 11:28:17 +0000 (11:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 5 May 2017 06:26:52 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
Bill Yi [Fri, 5 May 2017 06:09:38 +0000 (23:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I640708da51131645bee0b3dd92968ead7a2e44f0
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 5 May 2017 04:50:11 +0000 (04:50 +0000)]
Merge "Add ability to speak to provider for enhanced estimate"
TreeHugger Robot [Fri, 5 May 2017 03:13:56 +0000 (03:13 +0000)]
Merge "Fix randomly showing anomaly icon"
Salvador Martinez [Thu, 4 May 2017 01:58:27 +0000 (18:58 -0700)]
Add ability to speak to provider for enhanced estimate
Added code that checks if the provider for the enhanced battery
drain estimate is available. If it is available we use that
value instead of the one computed by BatteryStats.
Test: Robotests
Bug:
37753227
Change-Id: I7eae01b56f85d33eafc42ee0f18bb752779581b2
TreeHugger Robot [Fri, 5 May 2017 02:39:42 +0000 (02:39 +0000)]
Merge "Swipe for notification should be default-on in settings app"
Dan Sandler [Fri, 5 May 2017 02:34:29 +0000 (02:34 +0000)]
Merge "Defend against underspecified notifications." into oc-dev am:
1bba60cf0e
am:
ca445e20af
Change-Id: I176281bc5367e671f056834720586fc0735072b4
Dan Sandler [Fri, 5 May 2017 02:25:31 +0000 (02:25 +0000)]
Merge "Defend against underspecified notifications." into oc-dev
am:
1bba60cf0e
Change-Id: I5aec6c34bd9c8b985637d38a73a21db88e6642a9
TreeHugger Robot [Fri, 5 May 2017 02:22:48 +0000 (02:22 +0000)]
Merge "Limit the summary text for App info->Permissions to one line."
TreeHugger Robot [Fri, 5 May 2017 02:21:10 +0000 (02:21 +0000)]
Merge "Defend against underspecified notifications." into oc-dev
Suprabh Shukla [Wed, 3 May 2017 01:06:16 +0000 (18:06 -0700)]
Adding SecureTouchListener to DeviceAdminAdd
Dropping any touches to the activate admin button if any other
window is partly or wholly obscuring the device admin add window
Test: Cts Verifier -> Device Administration -> Device Admin Tapjacking
Test
Bug:
35056974
Change-Id: I048ecc1944c13fea624eede7861d39df2beeb393
TreeHugger Robot [Fri, 5 May 2017 01:27:20 +0000 (01:27 +0000)]
Merge "Add impl for force stop action"
jackqdyulei [Fri, 5 May 2017 01:02:14 +0000 (18:02 -0700)]
Fix randomly showing anomaly icon
Sometimes PowerGaugePreference will show anomaly icon when they
shouldn't. I think it is because PreferenceViewHolder has cache
about the previous data.
This cl fixes it by setting compound drawable as 0 when
showAnomalyIcon is false.
Bug:
36924669
Test: RunSettingsRoboTests
Change-Id: I5ea0dc307aafcce386c84963e618d1213de5ec19
Ajay Panicker [Fri, 5 May 2017 00:17:30 +0000 (00:17 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev am:
b72a8b5ab3 -s ours
am:
bb98791b80 -s ours
Change-Id: I43c8352e07427f7c2a42125516de0c7f8e52fdf2
Ajay Panicker [Thu, 4 May 2017 23:21:19 +0000 (23:21 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev
am:
b72a8b5ab3 -s ours
Change-Id: I2ecb2e2c297953eba1f515e636c6204e8474591e
Doris Ling [Thu, 4 May 2017 21:33:52 +0000 (14:33 -0700)]
Limit the summary text for App info->Permissions to one line.
- the summary text is the list of permissions that the app has. It is
dynamic, and when the list is long, setting the summary will expand
the text view height and make the page launch looks janky. We cannot
pre-set the summary to certain line, since the permissions list for each
app is unknown beforehand. To avoid the jank, limit the summary to 1
line and truncate it if necessary.
Change-Id: I1acb1ac9f46c55808ce03626e53cf71502231ab2
Fix:
36413664
Test: make RunSettingsRoboTests
Ajay Panicker [Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev
Daniel Sheng [Thu, 4 May 2017 22:14:39 +0000 (15:14 -0700)]
Camera lift preference now saves correctly
Bug:
37751057
Test: manual + make RunSettingsRoboTests
Fixed issue where camera lift preference was saving the opposite value
of what it was supposed to. Added test to cover saving of value on
preference change.
Change-Id: I2d2c454eb478afb7f73519f9f05c9a9a1933938b
TreeHugger Robot [Thu, 4 May 2017 21:58:10 +0000 (21:58 +0000)]
Merge "Force refresh language & input fragment title onResume."
TreeHugger Robot [Thu, 4 May 2017 21:32:29 +0000 (21:32 +0000)]
Merge "Add control for the anomaly detection"
Daniel Nishi [Wed, 3 May 2017 20:36:36 +0000 (13:36 -0700)]
Fix Settings crash in Storage settings.
If you tap aggressively before the fragment has fully initialized, it
was possible to NPE. This null-checks to avoid this.
Change-Id: I3488245d230cf1e16b23e34614c8e6b43ea14ff1
Fixes:
37945253
Test: Robotest
OSDN Git Service
