Commit Graph

15806 Commits

Author SHA1 Message Date
Daniel Nishi
70085ec0ae Merge "Lower case the first letter of storage type." 2017-03-29 21:13:19 +00:00
Daniel Nishi
56a078d46d Merge "Add a movies & tv apps category to storage settings." 2017-03-29 21:13:05 +00:00
Stephen Chen
6d0ea0b472 Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev am: 31170fb629
am: 180810d00c

Change-Id: I7a405f1abfe753ab70ac8e83829dc22a74a1c66b
2017-03-29 21:08:55 +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
c209851d54 Merge "Only register conditions receiver when needed." into oc-dev am: 258e8a8117
am: c5cc3ad8ab

Change-Id: Iee3b638cf04acd6fa6ea01ec5ec24e001e15141a
2017-03-29 20:37:01 +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
Lei Yu
96363bbd14 Merge "Add summary for categories in battery advanced page" 2017-03-29 20:18:22 +00:00
TreeHugger Robot
1a640c794b Merge "Keep EnterprisePrivacySettingsActivity always enabled" 2017-03-29 19:04:23 +00: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
cc1efb0d81 Merge "Don't run postexecute if activity is gone." into oc-dev am: a48cb8d978
am: 388b37c1fe

Change-Id: I96ac7df69f112cfb9f629c21a9da5c20d5b5a028
2017-03-29 18:23:47 +00: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
TreeHugger Robot
b7b074454b Merge "Create Controller for app buttons" 2017-03-29 18:18:17 +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
Bartosz Fabianowski
92d25fb5f3 Keep EnterprisePrivacySettingsActivity always enabled
The existing code checks during Settings startup whether the device is
managed. If it is not, EnterprisePrivacySettingsActivity is disabled.
If the device then becomes managed, Settings will not notice until
the next restart, causing any attempt to launch this Activity via an
Intent to crash.

This CL changes things so that the Activity is always enabled but
simply does nothing when launched on a non-managed device.

Bug: 34122104
Test: Integration test coming in a separate CL
Change-Id: I0a1dfcb41b405d981309696d97678df6787b4f72
2017-03-29 17:13:39 +02: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
e21ec8bbf6 resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp
am: 27ae2bb1fe

Change-Id: Ie1e53aa15cffef5f0e99f1601f9bab42dfe1e386
2017-03-29 13:16:37 +00: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
Stephen Chen
7495b52960 Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev am: d40ea0a963
am: 530c6dbbd8

Change-Id: I61ddb29ecd2ad5d2cb40ab8e780fe81f115731e1
2017-03-29 02:26:57 +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
jackqdyulei
3bbaca9c7c Add summary for categories in battery advanced page
If the category only contains one app, show usage time, otherwise
show app with maximum usage.

Also add usage time for apps in battery settings page.

Bug: 35396770
Test: RunSettingsRoboTests
Change-Id: I43fe9c2289535be2c1b95ffded6b52b0ff099589
2017-03-28 17:54:49 -07: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
Daniel Nishi
c2157ab443 Add a movies & tv apps category to storage settings.
Change-Id: Idfabe83739272b19cbef4b13a82339170f8f97b3
Fixes: 36223441
Test: Settings Robotest
2017-03-28 17:18:15 -07:00
Daniel Nishi
0d5d180d7d Lower case the first letter of storage type.
In the app details, the first letter of the storage type was
capitalized, causing an odd string of "X used in Internal storage."

Change-Id: I2b4f23ea1799dc1730fdab596e4a87a0cb673c68
Fixes: 36001265
Test: Settings robotest
2017-03-28 17:07:30 -07:00
jackqdyulei
82d07983b4 Create Controller for app buttons
These two buttons(uninstall + forcestop) are used in both battery page
and app page, we should move the logic for these two buttons into one
place.

This cl creates the AppButtonsPreferenceController for the above
purpose. This cl only copies the logic to controller but hasn't make
InstalledAppDetails use this controller.

Since DialogFragment could not use function in controller directly,
the controller expose DialogListener and all the fragments must
implement this interface. Then they can delegate the method call
to controller directly.

The following cl will:
1. Make the InstalledAppDetails be compatible to controller
2. Make the InstalledAppDetails use this controller.

Bug: 35810915
Test: RunSettingsRoboTests
Change-Id: Ie2aa8064bcec3003233896c18be772825b12930a
2017-03-28 17:05:19 -07:00
TreeHugger Robot
9502f112e6 Merge "Use buttons for EncryptionInterstitial" 2017-03-28 23:11:41 +00:00
Amin Shaikh
281265280c Merge "Remove delayed processing of UI events in onStop" into oc-dev am: 0f1d2bb81c
am: c8238c7fb9

Change-Id: I5ff3050197f938bbea5a59ac5e4db9e875cfff85
2017-03-28 20:48:36 +00: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
e3716b9be3 Revert "Convert BT preference to use TwoTargetPreference" am: 457c3cbec2
am: 6226a2b825

Change-Id: I3b3ab282b7f58c52baad57f3fa1fe51a090372ec
2017-03-28 20:21:52 +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
TreeHugger Robot
d86035b487 Merge "Hide Wifi and Systemui in settings main page" 2017-03-28 19:26:58 +00:00
TreeHugger Robot
e2e3098d67 Merge "OMADM Trigger in *#*#INFO#*#* hidden menu." 2017-03-28 19:14:18 +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
7f3ce8e862 Add null check for the media player when surface texture is available. am: 6709b6d399
am: abae2cf608

Change-Id: I501c20a178959a9c3661351cc479e20511ca2d41
2017-03-28 19:03:29 +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
Youhan Wang
fd781e91d4 OMADM Trigger in *#*#INFO#*#* hidden menu.
Test: make

Bug:32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
2017-03-28 11:01:26 -07:00
Doris Ling
29d4f1f4a0 Merge "Fix null pointer on dismissing suggestion." 2017-03-28 17:55:12 +00:00
Doris Ling
ae53f97650 Fix null pointer on dismissing suggestion.
Add null check for context when getting the suggestion identifier, since
this is called from async task and context might becomes null.

Change-Id: If17036803de1634891b659a4fc6bd4b8a76ef5fb
Fix: 36605386
Test: make RunSettingsRoboTests
2017-03-28 17:53:52 +00:00
jackqdyulei
1e95b74f77 Hide Wifi and Systemui in settings main page
Also move the systemui to category system

Fix: 36644740
Fix: 36645264
Test: RunSettingsRoboTests

Change-Id: I6b64a7dca58091f3a1d8b7d99c8bae7ddf9169f9
2017-03-28 10:51:12 -07:00
Daniel Nishi
c5f93b9ba5 Merge "Re-add the option to migrate data back." 2017-03-28 17:00:55 +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
TreeHugger Robot
6e0d19ff18 Merge "Use Collator to sort saved networks." 2017-03-28 16:25:53 +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
Noah Wang
474c291fa7 Adding help links to font size and display settings screens.
bug: 33110518
Change-Id: I5b75adc493ed0ab16a2dd653554af7a7c6e137ad
2017-03-28 02:01:26 -07: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