Matthew Fritze
74eda7150b
Merge "Check for dynamic summaries at display time for search" into oc-dev
...
am: 2046c59b77
2017-06-06 19:00:29 +00:00
Andrew Sapperstein
93adcee630
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
...
am: 37f87b6c64
2017-06-06 19:00:04 +00:00
TreeHugger Robot
2046c59b77
Merge "Check for dynamic summaries at display time for search" into oc-dev
2017-06-06 18:52:31 +00:00
TreeHugger Robot
37f87b6c64
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
2017-06-06 18:42:25 +00:00
Matthew Fritze
64736b6ae1
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
...
am: b8028f63ec
2017-06-06 17:58:30 +00:00
TreeHugger Robot
b8028f63ec
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
2017-06-06 17:44:23 +00:00
Daniel Nishi
0be5066922
Merge "Band aid to fix overly long text in donut." into oc-dev
...
am: b5abb2c1d2
2017-06-06 17:40:04 +00:00
Matthew Fritze
3a7f413468
Merge "Update the no-results icon in settings search" into oc-dev
...
am: 02e360dbc9
2017-06-06 17:34:31 +00:00
Daniel Nishi
b5abb2c1d2
Merge "Band aid to fix overly long text in donut." into oc-dev
2017-06-06 17:34:01 +00:00
Andrew Sapperstein
61353aa4fd
Revert "Add search bar to SearchActivity."
...
This reverts commit fac61b71e5
2017-06-06 17:29:41 +00:00
TreeHugger Robot
02e360dbc9
Merge "Update the no-results icon in settings search" into oc-dev
2017-06-06 17:25:57 +00:00
Matthew Fritze
ed761c4e74
Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
...
This reverts commit c1e9f8787f
2017-06-06 17:20:30 +00:00
Bill Yi
d650629364
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 11465af11e
2017-06-06 16:28:22 +00:00
TreeHugger Robot
11465af11e
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-06-06 16:17:44 +00:00
Matthew Fritze
0b4b716627
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
2017-06-06 08:34:16 -07:00
Salvador Martinez
4eb906a672
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
...
am: a8e887be86
2017-06-06 04:35:19 +00:00
Salvador Martinez
a8e887be86
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
2017-06-06 04:29:32 +00:00
Fan Zhang
89dc1d1ee2
Revert "Remove dynamic summary from Security Patch info"
...
The change breaks build
Fix: 62359766
Bug: 36101902
This reverts commit 2b562f84b6
2017-06-06 04:13:04 +00:00
jackqdyulei
0686f63083
Merge "Make footer preferences non-clickable by default" into oc-dev
...
am: 8fbb0bc1f2
2017-06-06 02:05:09 +00:00
TreeHugger Robot
8fbb0bc1f2
Merge "Make footer preferences non-clickable by default" into oc-dev
2017-06-06 01:54:00 +00:00
Lorenzo Colitti
844c385c09
Merge changes I23540440,I67269e1a into oc-dev
...
am: 4249a7092b
2017-06-06 01:27:32 +00:00
Lorenzo Colitti
4249a7092b
Merge changes I23540440,I67269e1a into oc-dev
...
* changes:
When validation state changes, update the AP summary.
Minor tweaks to WifiDetailPreferenceControllerTest.
2017-06-06 01:22:08 +00:00
Doris Ling
1104b94dbc
Merge "Also update flip camera settings for managed profile." into oc-dev
...
am: 051a83d909
2017-06-06 01:15:51 +00:00
Doris Ling
802db8a844
Remove call to WifiManager.setWifiApEnabled().
...
am: f38ed2fbb2
2017-06-06 01:15:10 +00:00
TreeHugger Robot
051a83d909
Merge "Also update flip camera settings for managed profile." into oc-dev
2017-06-06 01:12:29 +00:00
Matthew Fritze
6fa75da66d
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
2017-06-05 17:53:14 -07:00
Doris Ling
fed8ea8bce
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
2017-06-05 16:27:12 -07:00
Doris Ling
f38ed2fbb2
Remove call to WifiManager.setWifiApEnabled().
...
- replace it with ConnectivityManager.stopTethering() instead.
Change-Id: I112863b1be37c0fef5d59c16d73f0c6cf71c6dea
Fix: 62191978
Test: make RunSettingsRoboTests
2017-06-05 23:00:46 +00:00
Daniel Nishi
9f84622be4
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
2017-06-05 13:22:26 -07:00
jackqdyulei
6772f5a2c2
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
2017-06-05 10:44:34 -07:00
Lorenzo Colitti
2561df8083
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
2017-06-04 23:00:47 +09:00
Thecrazyskull
ecc7355bde
Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd
...
am: 7151be926d
2017-06-04 00:04:25 +00:00
Thecrazyskull
7151be926d
Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1
...
am: 6270dce2cd
2017-06-04 00:00:25 +00:00
Thecrazyskull
6270dce2cd
Merge "ConditionManager: don't crash when trying to add unexpected condition"
...
am: 46f7199cb1
2017-06-03 23:55:52 +00:00
Treehugger Robot
46f7199cb1
Merge "ConditionManager: don't crash when trying to add unexpected condition"
2017-06-03 23:49:39 +00:00
Mikhail Malakhov
38382a44b0
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am: c7697e9b8a am: 933cdd5503
...
am: 0730393097
2017-06-03 22:24:50 +00:00
Mikhail Malakhov
0730393097
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am: c7697e9b8a
...
am: 933cdd5503
2017-06-03 22:20:48 +00:00
Mikhail Malakhov
933cdd5503
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
...
am: c7697e9b8a
2017-06-03 22:16:48 +00:00
Treehugger Robot
c7697e9b8a
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
2017-06-03 22:11:13 +00:00
Tony Mantler
ea71adb730
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
...
am: 685041559a
2017-06-03 22:00:17 +00:00
TreeHugger Robot
685041559a
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
2017-06-03 21:40:56 +00:00
Bill Yi
016a542876
Import translations. DO NOT MERGE
...
Change-Id: I2484f37f3299006a02b28681ccd1be87123dba7b
Auto-generated-cl: translation import
2017-06-03 11:42:52 -07:00
Thecrazyskull
f7791d75bf
ConditionManager: don't crash when trying to add unexpected condition
...
* Instead, just don't add the unexpected condition
Test: none
Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
2017-06-02 22:50:47 +00:00
Tony Mantler
94c717f239
Move strings to SettingsLib so TV can use them
...
Bug: 38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
2017-06-02 15:10:18 -07:00
Peter Qiu
d8895787c9
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
...
am: 7eeca4b052
2017-06-02 20:38:58 +00:00
TreeHugger Robot
7eeca4b052
Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
2017-06-02 20:25:20 +00:00
Lei Yu
64c87589c5
Merge "Restart loader in onResume" into oc-dev
...
am: 74ca6aa060
2017-06-02 19:29:09 +00:00
Lei Yu
74ca6aa060
Merge "Restart loader in onResume" into oc-dev
2017-06-02 19:21:29 +00:00
Alison Cichowlas
f62c6372e8
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
2017-06-02 18:49:29 +00:00
TreeHugger Robot
e811873b4e
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
2017-06-02 18:42:25 +00:00
