OSDN Git Service
TreeHugger Robot [Sat, 16 Sep 2017 00:33:33 +0000 (00:33 +0000)]
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
Fan Zhang [Fri, 15 Sep 2017 20:22:04 +0000 (13:22 -0700)]
Use "mid" stable id for condition cards conditionally.
When there is no suggestion, use "mid" stableId instead of "top"
stableId for the header card.
This avoid an animation jank: when user swipes away a suggestion, the
condition summary header moves up instead of disappears then reappears.
Old behavior:
--- Suggestion --- --swipe--> /// Top Header ///
/// Mid Header ///
New behavior:
--- Suggestion --- -- swipe --> /// Mid Header ///
/// Mid Header ///
(Notice the header id change)
Change-Id: I63512d3d21382488e43dddb8819fabe4af40d101
Fixes:
65729560
Test: robotests
TreeHugger Robot [Fri, 15 Sep 2017 21:40:04 +0000 (21:40 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
Lei Yu [Fri, 15 Sep 2017 18:01:13 +0000 (18:01 +0000)]
Revert "Turn on wakeupAlarm anomaly detector"
This reverts commit
1a49a8ab3900ab77209b1c5b34a33cc3a8be3e2c.
Bug:
65738439
Test: RunSettingsRoboTests
Change-Id: Ifb2f72ba51e229b9387ff5a977bd51b229fcdf6a
Antony Sargent [Fri, 15 Sep 2017 17:32:07 +0000 (17:32 +0000)]
Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev
Soroosh Mariooryad [Fri, 15 Sep 2017 01:12:48 +0000 (01:12 +0000)]
Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev
Daniel Nishi [Fri, 15 Sep 2017 00:58:59 +0000 (00:58 +0000)]
Merge "Fix work profile storage bugs." into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 22:30:11 +0000 (22:30 +0000)]
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev
Zhijun He [Thu, 14 Sep 2017 19:01:42 +0000 (12:01 -0700)]
Revert "Settings: Enable HAL HDR+ by default"
This reverts commit
14c4b41f789541628070f3a2d23207239d4f7ae8.
Bug:
65679683
Antony Sargent [Thu, 14 Sep 2017 17:52:44 +0000 (10:52 -0700)]
Bring back "Turning on hotspot" status text when starting hotspot
We accidentally regressed showing this text when starting the hotspot in
the refactor ag/
2381595.
Bug:
64811203
Test: make RunSettingsRoboTests
Daniel Nishi [Tue, 12 Sep 2017 23:52:17 +0000 (16:52 -0700)]
Fix work profile storage bugs.
This makes apps and files in the work profile show up only for the work profile.
It turns out the primary profile's user id was getting piped down to the
special files views and it was showing the primary profile's file sizes
instead of the work ones.
Change-Id: If9c175f24920513c624c522d838bcdbe925566d1
Fixes:
65559258,
65558758,
65559934
Test: Settings robotest and
34768986
Daniel Nishi [Thu, 14 Sep 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 17:43:27 +0000 (17:43 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
jackqdyulei [Wed, 13 Sep 2017 20:35:02 +0000 (13:35 -0700)]
Update the bluetooth battery icon
In ag/
2863892, we add a new parameter to tune the size of battery icon.
This cl use this parameter and update the icon in bluetooth detail page.
Bug:
65397557
Test: RunSettingsLibRoboTests & Screenshots
Change-Id: I6dd26f14b3209101dd39320b3720fbd4f79acf54
Soroosh Mariooryad [Fri, 11 Aug 2017 07:04:37 +0000 (00:04 -0700)]
Log smart settings suggestion enabled/disabled state for A/B experiments
Test: RunSettingsRoboTests
Bug:
64121058
Change-Id: I0cf4b4a0e8470cd40d38e8fe937cfb5f3e96f380
Merged-In: Iadfa575b9a21caecb515b9975d388ee0d0480c11
Antony Sargent [Thu, 14 Sep 2017 00:04:42 +0000 (00:04 +0000)]
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
Daniel Nishi [Tue, 12 Sep 2017 22:55:46 +0000 (15:55 -0700)]
Close the load screen faster on pre-quota devices.
Pre-quota devices can take an absurd time to load. By loading the screen
once the volume sizes load, we can just show "calculating..." for a
really long time instead of a loading screen.
Change-Id: Id8ab0609c2bc19531d530c6bdf6bff89c5bfac96
Fixes:
64150148
Test: Settings Robotest
TreeHugger Robot [Wed, 13 Sep 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:34:27 +0000 (19:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 13 Sep 2017 16:45:46 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I34c1747c9f05b04794b7f563fc19f53467f21980
TreeHugger Robot [Wed, 13 Sep 2017 07:19:35 +0000 (07:19 +0000)]
Merge "Settings: Add laser sensor preference" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 01:38:20 +0000 (01:38 +0000)]
Merge "Init the pref summary in onCreate()" into oc-mr1-dev
Xiangyu/Malcolm Chen [Wed, 13 Sep 2017 01:07:29 +0000 (01:07 +0000)]
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 00:06:27 +0000 (00:06 +0000)]
Merge "Index the System status page" into oc-mr1-dev
TreeHugger Robot [Tue, 12 Sep 2017 23:20:03 +0000 (23:20 +0000)]
Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev
Daniel Nishi [Tue, 12 Sep 2017 23:05:12 +0000 (16:05 -0700)]
Remove outdated storage search results.
The cache category is gone. Also, downloads no longer comes from that
screen.
Change-Id: Ia9a85b6496b0be3106e0ca8572b7c0aed38f336c
Fixes:
65266640
Test: Manual
jackqdyulei [Tue, 12 Sep 2017 22:59:52 +0000 (15:59 -0700)]
Turn on wakeupAlarm anomaly detector
In ag/
2642771, wakeup alarms is changed to based on screen-off
timebase. After that, all the wakeup alarms will be background
ones.
So it is safe to turn on the wakeupAlarm anomaly detector.
Bug:
65597330
Test: RunSettingsRoboTests
Change-Id: I653d4bbfa671c52890dc6c6b13870c666ba9b944
jackqdyulei [Mon, 11 Sep 2017 21:33:28 +0000 (14:33 -0700)]
Init the pref summary in onCreate()
The visibility of bottom summary in BatteryHistoryPrefence will
be changed dynamically(charging status + flags). Before this cl,
we only update it in a callback, which makes other preference
may have unnecessary moves.
This cl add init method in onCreate(), which removes the uncessary
preference position moves.
Bug:
65529494
Test: RoboTest still pass
Change-Id: I09d2e26fc3caaeb272422997c16957770cdc1d3f
(cherry picked from commit
65dea0a7b2f44422aa3778b6565f1c4b7e5d9eb1)
Matthew Fritze [Fri, 8 Sep 2017 21:05:15 +0000 (14:05 -0700)]
Index the System status page
- Page is found in System > About Phone > Status
The page was simply never indexed.
- Remove the unavailable summary text.
- Suppress IP address because it appears in wifi
settings as well.
Test: make RunSettingsRoboTests
Change-Id: I0c5eb5222fc356dd3686fb84ca47da8e2d3274f5
Fixes:
65443327
Rebecca Silberstein [Fri, 8 Sep 2017 08:02:23 +0000 (01:02 -0700)]
Revert back to isDualBandSupported() for Wifi tethering.
This is needed to maintain OEM compatibility
Bug:
33160120
Test: robotests
Change-Id: Ic302969d33f32da72aee47d29615a250d3d924e2
Malcolm Chen [Tue, 12 Sep 2017 00:48:14 +0000 (17:48 -0700)]
In ApnEditor, restore preference values after re-creating.
After destroying and re-creating, the preference values in ApnEditor
are not restored. This results in incorrect behavior if it enters
two window mode where it's destroyed and re-created. The fix is to
have them restored and shown correctly.
Bug:
65338066
Test: Manual
Change-Id: I5ea16ce01c72061ab116f9c15bfc5cc39bb7a095
Antony Sargent [Mon, 11 Sep 2017 23:43:58 +0000 (16:43 -0700)]
Prevent brief flash of "Error" in hotspot status text
When toggling the master preference to turn on wifi hotspot, it briefly
changes the status text to "Error" because we have a catch-all in a
function monitoring wifi state changes for unexpected status codes, and
we weren't expecting to see the status of WIFI_AP_STATE_ENABLING before
the status of WIFI_AP_STATE_ENABLED.
Bug:
64811203
Test: make RunSettingsRoboTests
Change-Id: Ifba7abadbfba9ce93cc524b17232c65570f0f428
Maurice Lam [Mon, 11 Sep 2017 20:07:48 +0000 (20:07 +0000)]
Merge "Fix sizing of pattern view" into oc-mr1-dev
Maurice Lam [Fri, 8 Sep 2017 18:57:27 +0000 (11:57 -0700)]
Fix sizing of pattern view
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)
Test: Manual
Bug:
64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
TreeHugger Robot [Mon, 11 Sep 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
TreeHugger Robot [Mon, 11 Sep 2017 17:33:09 +0000 (17:33 +0000)]
Merge "Make system item has a consistent name." into oc-mr1-dev
Antony Sargent [Thu, 7 Sep 2017 23:19:17 +0000 (16:19 -0700)]
Fix focus behavior of ValidatedEditTextPreference
The bug report was that the cursor is set to the beginning of the
EditText for wifi hotspot password field, instead of at the end (or
having the entire field selected). This fix makes it so that all
ValidatedEditTextPreference's will put the cursor at the end of the
EditText.
Bug:
65413206
Test: make RunSettingsRoboTests
Change-Id: I23f3bb1b3f1b49b2f193c0ae2e103eae5c1a1019
TreeHugger Robot [Mon, 11 Sep 2017 04:56:28 +0000 (04:56 +0000)]
Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
Erik Kline [Wed, 6 Sep 2017 09:05:48 +0000 (18:05 +0900)]
Include IPv6 DNS servers in wifi details
Test: as follows
- built
- flashed
- booted
- export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
make -j RunSettingsRoboTests
RunSettingsRoboTests:
RunSettingsRoboTests: Time: 19.821
RunSettingsRoboTests:
RunSettingsRoboTests: OK (37 tests)
RunSettingsRoboTests:
- make -j RunSettingsRoboTests
RunSettingsRoboTests: ...........................
RunSettingsRoboTests: Time: 424.847
RunSettingsRoboTests:
RunSettingsRoboTests: OK (2250 tests)
RunSettingsRoboTests:
Bug:
65037256
Bug:
65467586
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
TreeHugger Robot [Fri, 8 Sep 2017 21:42:32 +0000 (21:42 +0000)]
Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
Daniel Nishi [Fri, 8 Sep 2017 21:39:16 +0000 (21:39 +0000)]
Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
Maurice Lam [Fri, 8 Sep 2017 19:50:52 +0000 (19:50 +0000)]
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 8 Sep 2017 19:08:48 +0000 (19:08 +0000)]
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
Maurice Lam [Thu, 7 Sep 2017 03:52:22 +0000 (20:52 -0700)]
Don't default to PIN on non FBE devices. DO NOT MERGE
So that EncryptionInterstitial is shown as part of the flow
Test: cd tests/robotests && mma
Bug:
65192141
Change-Id: I13e8b9059aae39cef2a8509f9f0eee1cd0808220
TreeHugger Robot [Fri, 8 Sep 2017 18:47:08 +0000 (18:47 +0000)]
Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 22:58:30 +0000 (15:58 -0700)]
Re-add the block of text explaining the feature.
When the automatic storage manager is off (or has never been run), we
display a block of text that explains what it does. In order to make
this testable, I've implemented the feature in a PreferenceController
and upgraded the existing AutomaticStorageManagerSettings class to be
closer to the newer Settings IA.
Change-Id: I3f7d20347a6d5a7bae8bffcd2014c3fdcd315b90
Fixes:
63082545
Test: Settings Robotest
Andrew Scull [Wed, 6 Sep 2017 16:53:25 +0000 (17:53 +0100)]
Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.
DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.
Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug:
65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
(cherry picked from commit
0aa45bed65f544e68e0d38f255da005b3ce9fddf)
TreeHugger Robot [Fri, 8 Sep 2017 06:36:46 +0000 (06:36 +0000)]
Merge "Set title in remote views if present in bundle" into oc-mr1-dev
Fan Zhang [Thu, 7 Sep 2017 23:06:24 +0000 (16:06 -0700)]
Don't attempt to tint icon if icon is not available
Change-Id: I0aa2a17d51d966dce182381c7bba8913ad997738
Fixes:
65460834
Test: robotests
Jack He [Thu, 31 Aug 2017 02:18:40 +0000 (19:18 -0700)]
Bluetooth: add metrics for pairing with devices without names
* Also caches context in onClick() method
Bug:
34685932
Test: make, unit test
Change-Id: I99beab2c85b8e48c4bc41f69146759d4b7c62428
Ajay Nadathur [Thu, 31 Aug 2017 18:37:32 +0000 (11:37 -0700)]
Set title in remote views if present in bundle
- Title set if defined in the Bundle returned by summaryUri's content
provider.
- summaryUri invoked inline with onBindView call
bug:
62713030
Test: Manually tested, verified that title and summary are retrieved
when settings app is resumed
Change-Id: Id82531eec5ec11ec3492f033fb34ec65a5437a48
Emilian Peev [Wed, 6 Sep 2017 15:47:08 +0000 (16:47 +0100)]
Settings: Add laser sensor preference
Add a switch for enabling/disabling the laser sensor within
developer options.
Test: Manual using setting app, RunSettingsRoboTests
Bug:
64423712
Change-Id: I89a32dfa062fc62c4be096d2e026a32ce9b784ca
TreeHugger Robot [Wed, 6 Sep 2017 23:20:40 +0000 (23:20 +0000)]
Merge "Turn in the work profile's badge." into oc-mr1-dev
Daniel Nishi [Wed, 6 Sep 2017 23:07:14 +0000 (23:07 +0000)]
Merge "Cache storage values for fast loading." into oc-mr1-dev
jackqdyulei [Wed, 6 Sep 2017 21:18:29 +0000 (14:18 -0700)]
Make system item has a consistent name.
In battery settings, the system item contains many packages. In old
behaviour it will use the first package(which has legal name and icon)
to represent this item. This behaviour is not consistent.
In this cl, we always use package "android" to extract name and icon
if it is system item.
Bug:
65090883
Test: RunSettingsRoboTests
Change-Id: Ibb7f85c06ab1745867f1eaa666cea32c8d3295a6
Alison Cichowlas [Wed, 6 Sep 2017 21:01:35 +0000 (21:01 +0000)]
Merge "Reorder "on the lock screen" options." into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Misc polishing fixes for Settings" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 19:53:39 +0000 (19:53 +0000)]
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 18:40:23 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 6 Sep 2017 18:27:10 +0000 (18:27 +0000)]
Import translations. DO NOT MERGE
am:
535dd7f066 -s ours
Change-Id: I49d4fe2d5608a2d050390d6e53a770c4dec11cff
TreeHugger Robot [Wed, 6 Sep 2017 18:26:13 +0000 (18:26 +0000)]
Merge "Properly show/hide advanced settings" into oc-mr1-dev
Fan Zhang [Wed, 6 Sep 2017 17:17:43 +0000 (10:17 -0700)]
Misc polishing fixes for Settings
- Never return null when querying userDictionaryLocales
- Auto mirror mobile setting icon in RTL to match status bar.
Fixes:
65298627
Fixes:
65361092
Test: robotests
Change-Id: I0f9827f7bc23baf4895712c0f86584aeccfb9c73
TreeHugger Robot [Wed, 6 Sep 2017 17:57:09 +0000 (17:57 +0000)]
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 19:45:56 +0000 (12:45 -0700)]
Turn in the work profile's badge.
The badge is no longer part of the preferred work profile UX. By
removing the code which badges the preferences for the individual
storage items, we can avoid placing the no longer needed tiny badges.
Change-Id: I6fd2ec28d3cf55e3a95b877f4c7b9b51c94e12d8
Fixes:
64475406
Test: Manual
Antony Sargent [Wed, 6 Sep 2017 16:42:41 +0000 (16:42 +0000)]
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 16:25:28 +0000 (16:25 +0000)]
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
Charles He [Wed, 6 Sep 2017 15:59:16 +0000 (15:59 +0000)]
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
Charles He [Sat, 2 Sep 2017 17:45:18 +0000 (18:45 +0100)]
Enforce wifi config lockdown on details page.
Fixes the bug that, on the new WifiDetailPreference page, the "Forget"
button is not disabled properly for wifi configs created and protected
by DevicePolicyManger.
Robolectric test to follow in a separate CL.
Test: manual, by locking down wifi config with TestDPC
Test: make RunSettingsRoboTests
Bug:
64971700
Bug:
65396674
Change-Id: I27740eabd5eb94415e4258c9c80f91df2d9ab476
Bill Yi [Wed, 6 Sep 2017 15:36:23 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic5ea1a8891c0c4cb30fa9466e2416dd469768814
Bill Yi [Wed, 6 Sep 2017 15:31:10 +0000 (08:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ie01e378113e1d71c095e3a750b668d59bf3e4c46
Julia Reynolds [Wed, 6 Sep 2017 13:09:30 +0000 (09:09 -0400)]
Properly show/hide advanced settings
Change-Id: I31f6f877f1945187a6f19e1b383bd3755656fb9b
Fixes:
65375390
Test: manual
Tony Mak [Tue, 5 Sep 2017 15:41:05 +0000 (16:41 +0100)]
Fix policy transparency is missing in remove work profile button
The policy transparency code is not triggered as the button is disabled.
BUG:
64570769
Test: 1. Remove work profile without restriction.
Test: 2. Remove work profile with restriction. Observed a dialog explains
why it is disabled.
Test: 3. Verify setting new admin, uninstall and deactivate button are
working
Change-Id: I1fc9c996785c67daf41a5d31e732d9d82eb56b17
Jack He [Tue, 5 Sep 2017 22:44:48 +0000 (15:44 -0700)]
Bluetooth: In-band ringtone setting should be reset to true
* Enable in-band ringing setting should be reset to true when toggling
developer options switch
Bug:
65382863
Test: make, try toggling "Enable in-band ringing" preference
Change-Id: Ic3221710983d5c493fa3dff36bc24611948fc4c1
Daniel Nishi [Thu, 10 Aug 2017 21:09:19 +0000 (14:09 -0700)]
Cache storage values for fast loading.
If the user moves away from the storage fragment and returns, this
allows us to use cached data from the previous calculation. If the data
is > 1 minute old, we consider it stale. Otherwise, we can bypass the
loading screen.
Fixes:
37923463
Test: Settings Robotest
Change-Id: I7650d4d742852f8d447878c077b9190bc0a0bb22
Fan Zhang [Tue, 5 Sep 2017 20:32:24 +0000 (13:32 -0700)]
Pre-set initial state to wifi tether switches.
The preset initial state helps eliminating animation jank when first
landing on the page.
Change-Id: Ia7ba83983f18409b1c653cc1ebb0f3aad281358c
Fixes:
64811322
Test: robotests
Stephen Chen [Fri, 1 Sep 2017 18:18:36 +0000 (11:18 -0700)]
Make auto Wi-Fi summary text consistent with feature availability.
"Turn Wi-Fi on automatically" feature is disabled when airplane mode or
battery saver mode is enabled, when Wi-Fi scanning is disabled, or when
network recommendations are disabled / scorer unset. This change
captures these negative cases in the summary text.
Bug:
65085700
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I2f2d22b5bef3ad03a28d34e79a27e6545cac557f
Alison Cichowlas [Tue, 5 Sep 2017 18:57:33 +0000 (14:57 -0400)]
Reorder "on the lock screen" options.
Fixes:
62872287
Change-Id: I7b2755e7a33fa1a31cebd18d93d268d330d87794
Test: RunSettingsRoboTests, manual
TreeHugger Robot [Tue, 5 Sep 2017 18:43:30 +0000 (18:43 +0000)]
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
Antony Sargent [Tue, 29 Aug 2017 16:30:52 +0000 (09:30 -0700)]
Fix Bluetooth switch status in Connected devices screen
The symptom observed is that the Bluetooth master switch on the
Connected devices page doesn't properly respond to Bluetooth turning off
via quicksettings - either turning on airplane mode or just toggling
Bluetooth.
The root cause was that MasterSwitchPreference's isChecked method would
not return the true value of whether the switch was checked - if the
control is disabled, it always just returns false. This interacts badly
with code in BluetoothEnabler - we disable the switch when the Bluetooth
state is in transition (eg becomes STATE_TURNING_OFF), and we also
attempt to avoid calling setChecked if the switch is already in the
desired state. So the switch would be checked but disabled, and we'd
avoid ever calling setChecked(false) on it.
A thorough fix would be to remove the code from MasterSwitchPreference's
isChecked method that looks at the enabled state, since enabled and
checked really should be treated as separate concerns. But given the
timeframe of MR1, we're opting for a more conservative fix of directly
accessing the switch and checking it's state, to avoid introducing bugs
in other consumers that might be depending on the current
behavior. We'll then do the thorough fix on the master branch which will
give a lot more time for any unexpected issues to be found (I audited
other usages and none seemed likely to be a problem, but it's better to
be safe than sorry).
Change-Id: I19a6c6b71e74595be3ef32a9718a430b67a89d53
Bug:
64940731
Test: make RunSettingsRoboTests
Adrian Roos [Tue, 5 Sep 2017 10:37:38 +0000 (12:37 +0200)]
FRP: Use SUW theme for factory reset protection flow
Bug:
37224506
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL com.android.settings; verify it uses correct theme
Change-Id: I237d8d84840398ebfdc97bf99dce07447042b349
TreeHugger Robot [Sat, 2 Sep 2017 03:29:52 +0000 (03:29 +0000)]
Merge "Make photos/videos storage preference normal." into oc-mr1-dev
Daniel Nishi [Wed, 23 Aug 2017 17:28:36 +0000 (10:28 -0700)]
Make photos/videos storage preference normal.
We had special behavior for it in the past, but this defines new
behavior that is much closer to what the other storage preferences do.
A photo app filter is used and a photos/video files preference exists on
it which intents over to the gallery app.
Fixes:
64147318
Test: Settings robotests
Change-Id: I47284515fe2dfcc924ae61a44bc47051e9f5fda6
TreeHugger Robot [Sat, 2 Sep 2017 00:17:08 +0000 (00:17 +0000)]
Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
Daniel Nishi [Fri, 1 Sep 2017 22:49:21 +0000 (22:49 +0000)]
Merge "Show work profile apps only on app list." into oc-mr1-dev
Amit Mahajan [Fri, 1 Sep 2017 22:42:09 +0000 (22:42 +0000)]
Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
Doris Ling [Thu, 24 Aug 2017 22:24:33 +0000 (15:24 -0700)]
Set drawable for the entity header app preference button.
In the entity header layout, the action buttons resource is set to null by
default. When we bind the button with the app preference action, we
should also set the drawable to the settings icon as well.
Change-Id: Ic259b4c538f529671ca5a9c67664ef32fbbb25ae
Fixes:
64826061
Test: make RunSettingsRoboTests
Daniel Nishi [Fri, 11 Aug 2017 01:32:25 +0000 (18:32 -0700)]
Show work profile apps only on app list.
For the work profile drilldown, we used to show all apps when the user
drilled down into the categories. This makes it so that the drill down
only shows the work apps when that deep.
Change-Id: I492cd3e9b9b923b87b68645a871dcfb2b91b4f95
Fixes:
62963093
Test: Settings robotest
Doris Ling [Thu, 31 Aug 2017 21:58:15 +0000 (14:58 -0700)]
Update accessibility preference icon.
Change-Id: I84fb84e0a8bb422b9e453bd9b94e99bfb8a73be3
Fixes:
65256821
Test: visual
Amit Mahajan [Thu, 31 Aug 2017 20:59:20 +0000 (13:59 -0700)]
Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug:
65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
TreeHugger Robot [Thu, 31 Aug 2017 19:51:50 +0000 (19:51 +0000)]
Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 19:16:50 +0000 (19:16 +0000)]
Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
Phil Weaver [Thu, 31 Aug 2017 17:34:39 +0000 (17:34 +0000)]
resolve merge conflicts of
94c5202965 to oc-dr1-dev
am:
f65e790ba0 -s ours
Change-Id: Ie761a3c3472ba8ae2c54acc32c1368378bc54fb5
Daniel Nishi [Thu, 31 Aug 2017 17:20:14 +0000 (17:20 +0000)]
Merge "Tint the work icon." into oc-mr1-dev
Zhijun He [Thu, 31 Aug 2017 04:20:59 +0000 (04:20 +0000)]
Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
Jack He [Wed, 30 Aug 2017 23:12:45 +0000 (16:12 -0700)]
Bluetooth: do not dimiss fragment when Activity.finish() is called
* When Activity.finish() is called, it's associtated fragments are all
dismissed automatically
* Cached used fragments are dimissed in onCreate() before new ones are
created
Bug:
62230203
Test: Pair with Bluetooth device, Settings unit tests
Change-Id: Ieca88ba0660c5407f0d88d572d06a722c642ac39
Fan Zhang [Wed, 30 Aug 2017 22:18:27 +0000 (15:18 -0700)]
Misc icon updates
Fixes:
65204006
Test: visual
Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7
Phil Weaver [Tue, 29 Aug 2017 20:36:21 +0000 (13:36 -0700)]
resolve merge conflicts of
94c5202965 to oc-dr1-dev
Bug:
62196835
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
Lei Yu [Wed, 30 Aug 2017 17:02:21 +0000 (17:02 +0000)]
Merge "Add device/profile app check in background check" into oc-mr1-dev
jackqdyulei [Tue, 22 Aug 2017 18:25:30 +0000 (11:25 -0700)]
Add device/profile app check in background check
If app is device or profile app, we disable the background check
toggle. This cl also create an util method for this check and
remove duplicate code
Bug:
64665807
Test: RunSettingsRoboTests
Change-Id: Id8336eadaac8832327bc3653aaa7dfbacde352ac