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
jackqdyulei
ee01dcc74a
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
2017-06-02 10:21:32 -07:00
Peter Qiu
1fcb026a3a
wifi: use WifiSavedConfigUtils to retrieve saved configurations
...
Bug: 62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
2017-06-02 17:16:54 +00:00
Lei Yu
f2379e2ed3
Merge "Refine the ProgressCategory" into oc-dev
...
am: 5f4f1b81af
2017-06-02 17:13:55 +00:00
Lei Yu
5f4f1b81af
Merge "Refine the ProgressCategory" into oc-dev
2017-06-02 17:08:45 +00:00
Alison Cichowlas
5698552021
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
...
am: 3efc502840
2017-06-02 16:56:59 +00:00
TreeHugger Robot
3efc502840
Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
2017-06-02 16:46:52 +00:00
Alison Cichowlas
b143e15dd1
Merge "Add group name into channel summary, if applicable." into oc-dev
...
am: 4b29f593f0
2017-06-02 15:48:25 +00:00
Alison Cichowlas
4b29f593f0
Merge "Add group name into channel summary, if applicable." into oc-dev
2017-06-02 15:39:44 +00:00
Bartosz Fabianowski
98b216dc05
Hide "Changes made by your organization's admin" when empty
...
am: 493495452a
2017-06-02 13:30:12 +00:00
Bartosz Fabianowski
493495452a
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
2017-06-02 13:45:40 +02:00
Lorenzo Colitti
beafc36360
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
2017-06-02 17:56:52 +09:00
Esteban Talavera
42d97f86c2
Merge "Include disabled managed profiles in Accounts page" into oc-dev
...
am: 92f78354f9
2017-06-02 08:38:51 +00:00
Esteban Talavera
92f78354f9
Merge "Include disabled managed profiles in Accounts page" into oc-dev
2017-06-02 08:33:17 +00:00
Lorenzo Colitti
cc347f4e14
Merge changes from topic 'wifi_detail_jank' into oc-dev
...
am: 0187221bd8
2017-06-02 06:18:13 +00:00
TreeHugger Robot
0187221bd8
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.
2017-06-02 06:11:52 +00:00
Sheng Wang
d453911e27
Volume can not be updated in Sound¬ification
...
am: 8c329af634
2017-06-02 04:29:05 +00:00
Sheng Wang
61a420df95
Merge "Volume can not be updated in Sound¬ification" am: c0fdbab185 am: 161e3d14e1
...
am: 9dbd34a3d9
2017-06-02 00:27:56 +00:00
Sheng Wang
9dbd34a3d9
Merge "Volume can not be updated in Sound¬ification" am: c0fdbab185
...
am: 161e3d14e1
2017-06-02 00:25:17 +00:00
Sheng Wang
161e3d14e1
Merge "Volume can not be updated in Sound¬ification"
...
am: c0fdbab185
2017-06-02 00:21:45 +00:00
Treehugger Robot
c0fdbab185
Merge "Volume can not be updated in Sound¬ification"
2017-06-02 00:14:16 +00:00
