Commit Graph

15778 Commits

Author SHA1 Message Date
Christine Franks
58cbd30873 Merge "Disable default indicator for night display" into oc-dev
am: 231ed14e46

Change-Id: Ibf1034bf8edff6ad54a10c4d46b8740bbe685dea
2017-03-29 22:45:13 +00:00
Christine Franks
231ed14e46 Merge "Disable default indicator for night display" into oc-dev 2017-03-29 22:41:41 +00:00
Stephen Chen
180810d00c Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev
am: 31170fb629

Change-Id: Iee3dace687af34d3a1f75e9f201a38135c3f7997
2017-03-29 21:06:55 +00:00
TreeHugger Robot
31170fb629 Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev 2017-03-29 21:00:56 +00:00
Doris Ling
c5cc3ad8ab Merge "Only register conditions receiver when needed." into oc-dev
am: 258e8a8117

Change-Id: Ifc56d2c84f38c4c924596aff660e7c156166266e
2017-03-29 20:35:44 +00:00
Doris Ling
258e8a8117 Merge "Only register conditions receiver when needed." into oc-dev 2017-03-29 20:33:21 +00:00
Christine Franks
07bfdc04d7 Disable default indicator for night display
Bug: 36695989
Test: make -j100, and manually verified that default indicator no
longer appears on the SeekBar.

Change-Id: I574938bc664f8b750a3fe9ab52f361f46ad1f327
2017-03-29 12:20:29 -07:00
Stephen Chen
b19b8f37c9 Connect immediately after pressing on previously connected saved networks.
Bug: 34287193
Test: manual inspection
Change-Id: Idf7156fa48640a34ce11cbf2f9683cfc6525a7b5
2017-03-29 11:50:16 -07:00
Julia Reynolds
388b37c1fe Merge "Don't run postexecute if activity is gone." into oc-dev
am: a48cb8d978

Change-Id: I0dc6f1393423509cf7c679395f621828c7948b5f
2017-03-29 18:22:21 +00:00
Doris Ling
0f01c849cd Only register conditions receiver when needed.
1. Update the dnd receiver to listen when dashboard summary running.
- remove the dnd receiver from Android manifest, and create it inside
the dnd condition.
- add lifecycle implementation to condition manager, so that the dnd
condition can know when to register and unregister the receiver.
- remove getReceiverClass() from dnd condition so that its receiver will
not be disabled by the default condition handling when condition is
silenced.

2. Remove all other conditions receiver from Android manifest.
- the broadcast receivers for HotspotCondition, AirplaneModeCondition,
CellularDataCondition from the manifest and create them inside the
condition classes.
- update Condition.onSilenceChanged() to register/unregister the
receivers instead of enable/disable the receiver class.

Change-Id: Iea6288382680df2b02884d1934b8db85daae404c
Fix: 35968517
Test: make RunSettingsRoboTests
2017-03-29 10:47:04 -07:00
Julia Reynolds
dd8d392d7d Don't run postexecute if activity is gone.
Change-Id: I9133a4d9e4e0fd2a92cc4df786e0bc5407d981fe
Fixes: 36551766
Test: monkey tests
2017-03-29 10:42:07 -04:00
Robin Lee
27ae2bb1fe resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp
Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
2017-03-29 13:54:02 +01:00
Robin Lee
86c72f7ea5 Merge "Optimize code on get UidDetail in AppDataUsage" am: ec6da66728
am: 9fff988f4a

Change-Id: I7f6570192ff654203c835cc23c46139bf10e178e
2017-03-29 12:37:05 +00:00
Robin Lee
9fff988f4a Merge "Optimize code on get UidDetail in AppDataUsage"
am: ec6da66728

Change-Id: Icacae2c9cfaa6064cbb909cc06ff15791c9494d0
2017-03-29 12:34:39 +00:00
Robin Lee
ec6da66728 Merge "Optimize code on get UidDetail in AppDataUsage" 2017-03-29 12:29:36 +00:00
TreeHugger Robot
d40ea0a963 Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev 2017-03-29 02:20:10 +00:00
Stephen Chen
a82c048e12 Do not disable toggle when Wi-Fi is enabling and disabling.
The toggle disabling of Wi-Fi in its ENABLING and DISABLING states
are not in sync with the loading of access points, and so removed
the disabling entirely.

Bug:34287227
Test: manual inspection.
Change-Id: Ibcb401eaaa34be79e1e73a947b2ea845cca79996
2017-03-28 17:20:41 -07:00
TreeHugger Robot
0f1d2bb81c Merge "Remove delayed processing of UI events in onStop" into oc-dev 2017-03-28 20:38:25 +00:00
Doris Ling
457c3cbec2 Revert "Convert BT preference to use TwoTargetPreference"
This reverts commit 09c7f15b12.

Change-Id: I29aa67f026c0b54da08b19657f9916275e5a3459
2017-03-28 20:03:10 +00:00
Amin Shaikh
5e0c60d2ac Remove delayed processing of UI events in onStop
Bug: 36682492
Test: manually; test tracking in b/36403635
Change-Id: Ia369cd61a6473ae2af4891cf6b923900504921c1
2017-03-28 19:13:23 +00:00
Doris Ling
6709b6d399 Add null check for the media player when surface texture is available.
- Call to MediaPlayer.create() method can return null, and hence we need
to check the return value before trying access the media player.

Change-Id: I4a5e0edbd6db21b678efb05ea733187f34185432
Fix: 36668356
Test: make RunSettingsRoboTests
2017-03-28 18:28:44 +00:00
Amin Shaikh
32924e2f58 Use Collator to sort saved networks.
Bug: 36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
(cherry picked from commit 0c0fc19aef)
2017-03-28 16:40:20 +00:00
tiansiming
40234f6fe2 Optimize code on get UidDetail in AppDataUsage
The class UidDetailProvider providers details about a specific UID,
we can directly  apply it here.

Optimize: https://code.google.com/p/android/issues/detail?id=237810
Test: for case TrafficStats.UID_REMOVED
1.add an new User
2.generate some data traffic under the new user
3.switch to the phone owner
4.delete the User added just now
5.go to Data usage and open the item "Removed apps and users"

    for case TrafficStats.UID_TETHERING
1.open tethering and generate some data traffic
2.go to Data usage and open the item "Tethering & portable hotspot"

Change-Id: I05aa522728b296d6c06580adf809f274491cdcea
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-03-28 22:13:53 +08:00
fen wang
c79681d88c Merge "Initialize LDAC to ABR mode" am: f80b445166 am: 8bed25af1f
am: 9660f0ee80

Change-Id: I4ff3e93ae7093deb94006c4ddf651045a1c0ad13
2017-03-28 05:19:49 +00:00
fen wang
9660f0ee80 Merge "Initialize LDAC to ABR mode" am: f80b445166
am: 8bed25af1f

Change-Id: Iab167bc1688e87ea0aeb44853dda3854d1601fc9
2017-03-28 05:11:38 +00:00
fen wang
8bed25af1f Merge "Initialize LDAC to ABR mode"
am: f80b445166

Change-Id: If89ff9a484b13a61e783c0eaf251e6fd9fbb6ea8
2017-03-28 05:03:43 +00:00
fen wang
8e568ec84c Initialize LDAC to ABR mode
Bug: 35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
2017-03-28 01:32:38 +00:00
Steven Moreland
20f9ab272a Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c am: 68b580f346
am: efb7925e7a

Change-Id: I0d97c4ecfb4cd04ee0a19468c0c8382e61f4ae79
2017-03-28 01:27:24 +00:00
TreeHugger Robot
f85ebb24bb Merge "Changes to installed app details screen for instant apps" 2017-03-28 01:22:47 +00:00
Steven Moreland
efb7925e7a Merge "Revert "Development Options: toggle binderized hals"" am: 21de66bc0c
am: 68b580f346

Change-Id: I95ed12e6c619397a1434d30c714f8f8424036647
2017-03-28 01:21:58 +00:00
Steven Moreland
68b580f346 Merge "Revert "Development Options: toggle binderized hals""
am: 21de66bc0c

Change-Id: If9288dda590a4f7fe5a60faeec695045e038ead1
2017-03-28 01:18:00 +00:00
Treehugger Robot
21de66bc0c Merge "Revert "Development Options: toggle binderized hals"" 2017-03-28 01:12:14 +00:00
TreeHugger Robot
22e4051ca9 Merge "Fix forget button on wifi details page." 2017-03-28 00:31:06 +00:00
TreeHugger Robot
8d3a639784 Merge "Move automatic rules to main DND settings page." 2017-03-27 23:35:45 +00:00
Amin Shaikh
ffd3197510 Fix forget button on wifi details page.
- Corrected logic for forgetting the current network in the network
details page
- After a user has forgotten a network, the button becomes disabled
(TODO final UX on this - go/remaining-wifi-picker-work tracks this)
- Added unit tests for forgetting network flow
- Fixed bug where the current tethering WifiConfiguration was associated
with the currrent network

Bug: 36458941
Test: m RunSettingsRoboTests
Change-Id: Ie3c4bae8b295908b17179e60359c8bc599519744
2017-03-27 16:10:33 -07:00
Daniel Nishi
16e9247d21 Merge "Badge the icons for profile storage screen." 2017-03-27 22:20:09 +00:00
Antony Sargent
09955c3865 Changes to installed app details screen for instant apps
Bug: 35098444
Test: make RunSettingsRoboTests

This implements the following changes to the app details screen:

-Suppresses the "Uninstall" and "Force Stop" buttons
-Adds "Install app" and "Clear app" buttons
-Adds a mechanism for showing a link to the store's app details
 page that can be different from the default for installed apps.

Change-Id: Icea83f7d1fde62d4101cb0c8a6d03849f6c56bca
2017-03-27 14:34:56 -07:00
Julia Reynolds
e17590271f Move automatic rules to main DND settings page.
Change-Id: I32b103714d4864ab32e2c85d86106dc118f9c338
Fixes: 31050255
Test: manual
2017-03-27 15:57:39 -04:00
Stephen Chen
11478573ec Expand Wifi Picker Menu by default.
Bug: 36575182
Test: make SettingsFunctionalTests and ran tests on device.
Change-Id: I256ea82a8e4478d81497b9a56cc4fb7755839f1c
2017-03-27 11:26:46 -07:00
Robin Lee
b26ce1e13b resolve merge conflicts of 90f009ebb5 to master
Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46
2017-03-27 17:35:57 +01:00
Robin Lee
90f009ebb5 Merge "[VpnSettings]Crash when activity has been recycled" am: fb81f50c27
am: c834ed1e4e

Change-Id: I32ddda40ed4654288eef45dfdb2f53b2f9aba988
2017-03-27 16:25:24 +00:00
Robin Lee
c834ed1e4e Merge "[VpnSettings]Crash when activity has been recycled"
am: fb81f50c27

Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
2017-03-27 16:22:56 +00:00
Robin Lee
fb81f50c27 Merge "[VpnSettings]Crash when activity has been recycled" 2017-03-27 16:18:20 +00:00
TreeHugger Robot
f7fb763ed5 Merge "Populate summary for top level wifi picker options" 2017-03-27 15:48:55 +00:00
TreeHugger Robot
08a3bb368b Merge "Update Sound settings." 2017-03-25 18:30:36 +00:00
TreeHugger Robot
4fa5c7b8ba Merge "Move reset options to one place" 2017-03-25 18:17:15 +00:00
TreeHugger Robot
2dd81e9007 Merge "Change default value for vibrate on touch to 0 (off)." 2017-03-25 17:54:49 +00:00
TreeHugger Robot
4eade0aad5 Merge "Fix Accessibility Settings crash" 2017-03-25 14:58:45 +00:00
Robin Lee
edecaa782f Merge "UserCredentialsSettings: that fresh new blank look" 2017-03-25 11:15:26 +00:00
Casey Burkhardt
059a8e3d12 Fix Accessibility Settings crash
Update preference key to reference new magnification preference screen.
Bug: 36606349
Test: Manual

Change-Id: Iefb114bea6a58d6f8939ae863959d4a6922f5a1d
2017-03-24 23:33:45 -07:00