Commit Graph

15836 Commits

Author SHA1 Message Date
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
Jesse Evans
14a258443f Removes summary text from Instant Apps details
Test: Robolectric test to ensure header item is GONE.

Bug: 36512295
Change-Id: I020e90d6521c853e67ae600e5786445a8469a934
2017-03-28 18:17:59 -07: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
fen wang
8bed25af1f Merge "Initialize LDAC to ABR mode"
am: f80b445166

Change-Id: If89ff9a484b13a61e783c0eaf251e6fd9fbb6ea8
2017-03-28 05:03:43 +00:00
Maurice Lam
fc972a75a9 Allow remote views to be used in Tiles
If a suggeested action Tile has a remote view defined, inflate a card
layout to contain the remote view, instead of showing the default
title-summary layout.

Additionally, if the remote view has a view with ID
@android:id/primary, that will be used as the click target rather
than the entire card.

Test: cd tests/robotests && mma
Bug: 35668836
Change-Id: I0fd1b9c637b6d7a3d7d2f6268669917408a882eb
2017-03-27 20:32:20 -07:00
Amin Shaikh
0c0fc19aef Use Collator to sort saved networks.
Bug: 36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
2017-03-27 19:01:26 -07: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
Daniel Nishi
e31550d809 Re-add the option to migrate data back.
Currently, users can use an SD card or USB drive and adopt it as
internal storage using existing flows. They can manage this drive
perfectly fine using the old storage screen, which is still around.

One functionality that was lost was the ability to migrate data from
the adopted drive back to the private internal storage. This appeared
in a dropdown in the old storage settings.

By duplicating the code to create just that specific menu item and its
click behavior, we can restore this functionality to the new storage
view.

Change-Id: I4b8c06912d2c0b2c5be5bce8b217d45accf34d4b
Fixes: 35926028
Test: Settings Robotest
2017-03-27 20:41:21 +00: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