OSDN Git Service
TreeHugger Robot [Wed, 29 Mar 2017 20:30:26 +0000 (20:30 +0000)]
Merge "Remove android:visibility attributes from Preferences"
Lei Yu [Wed, 29 Mar 2017 20:18:21 +0000 (20:18 +0000)]
Merge "Add summary for categories in battery advanced page"
TreeHugger Robot [Wed, 29 Mar 2017 19:04:22 +0000 (19:04 +0000)]
Merge "Keep EnterprisePrivacySettingsActivity always enabled"
Julia Reynolds [Wed, 29 Mar 2017 18:23:47 +0000 (18:23 +0000)]
Merge "Don't run postexecute if activity is gone." into oc-dev am:
a48cb8d978
am:
388b37c1fe
Change-Id: I96ac7df69f112cfb9f629c21a9da5c20d5b5a028
Julia Reynolds [Wed, 29 Mar 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Don't run postexecute if activity is gone." into oc-dev
am:
a48cb8d978
Change-Id: I0dc6f1393423509cf7c679395f621828c7948b5f
TreeHugger Robot [Wed, 29 Mar 2017 18:19:03 +0000 (18:19 +0000)]
Merge "Don't run postexecute if activity is gone." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 18:18:16 +0000 (18:18 +0000)]
Merge "Create Controller for app buttons"
Maurice Lam [Wed, 29 Mar 2017 16:53:56 +0000 (16:53 +0000)]
Merge "Revert choose lock header file to non-setup theme" into oc-dev am:
1ecbb7d16d
am:
40c22ec75a
Change-Id: I6d2d29f3166ff88a38c92b1eb3fa00c7c2abe61c
Maurice Lam [Wed, 29 Mar 2017 16:48:02 +0000 (16:48 +0000)]
Merge "Revert choose lock header file to non-setup theme" into oc-dev
am:
1ecbb7d16d
Change-Id: I90b936ea2ee30f35e636b9d7aa50d5e641ca9374
Maurice Lam [Wed, 29 Mar 2017 15:45:21 +0000 (15:45 +0000)]
Merge "Revert choose lock header file to non-setup theme" into oc-dev
Bartosz Fabianowski [Fri, 24 Mar 2017 17:32:50 +0000 (18:32 +0100)]
Remove android:visibility attributes from Preferences
The android:visibility attribute is not applicable to Preferences and
does nothing.
Bug:
32692748
Test: None
Change-Id: I9aa6c3df824b61f96466cc7de6c046870a46678c
Bartosz Fabianowski [Fri, 24 Mar 2017 17:04:31 +0000 (18:04 +0100)]
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
Julia Reynolds [Wed, 29 Mar 2017 14:41:22 +0000 (10:41 -0400)]
Don't run postexecute if activity is gone.
Change-Id: I9133a4d9e4e0fd2a92cc4df786e0bc5407d981fe
Fixes:
36551766
Test: monkey tests
Robin Lee [Wed, 29 Mar 2017 13:16:37 +0000 (13:16 +0000)]
resolve merge conflicts of
86c72f7ea5 to oc-dev-plus-aosp
am:
27ae2bb1fe
Change-Id: Ie1e53aa15cffef5f0e99f1601f9bab42dfe1e386
Robin Lee [Wed, 29 Mar 2017 12:54:02 +0000 (13:54 +0100)]
resolve merge conflicts of
86c72f7ea5 to oc-dev-plus-aosp
Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
Robin Lee [Wed, 29 Mar 2017 12:37:05 +0000 (12:37 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage" am:
ec6da66728
am:
9fff988f4a
Change-Id: I7f6570192ff654203c835cc23c46139bf10e178e
Robin Lee [Wed, 29 Mar 2017 12:34:39 +0000 (12:34 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage"
am:
ec6da66728
Change-Id: Icacae2c9cfaa6064cbb909cc06ff15791c9494d0
Robin Lee [Wed, 29 Mar 2017 12:29:35 +0000 (12:29 +0000)]
Merge "Optimize code on get UidDetail in AppDataUsage"
Maurice Lam [Tue, 28 Mar 2017 23:27:03 +0000 (16:27 -0700)]
Revert choose lock header file to non-setup theme
The activity ChooseLockGeneric which inflates the layout file
choose_lock_generic_fingerprint_header is not setup themed, and
therefore should not use setup resources.
Test: Run ChooseLockGenericTest via `am instrument`
Bug:
36688431
Change-Id: I7286958345d1762d4a93176afe300d1e4d168f6d
Stephen Chen [Wed, 29 Mar 2017 02:26:57 +0000 (02:26 +0000)]
Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev am:
d40ea0a963
am:
530c6dbbd8
Change-Id: I61ddb29ecd2ad5d2cb40ab8e780fe81f115731e1
Stephen Chen [Wed, 29 Mar 2017 02:24:27 +0000 (02:24 +0000)]
Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev
am:
d40ea0a963
Change-Id: Ie2b6385a47b7f6064e453ae09a5155d0ed16329f
TreeHugger Robot [Wed, 29 Mar 2017 02:20:09 +0000 (02:20 +0000)]
Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev
Maurice Lam [Wed, 29 Mar 2017 01:25:21 +0000 (01:25 +0000)]
Merge "Add DEFERRED_SETUP as exclusive suggestion"
TreeHugger Robot [Wed, 29 Mar 2017 01:16:51 +0000 (01:16 +0000)]
Merge "Increase the char limit for the bluetooth tethering strings."
jackqdyulei [Mon, 27 Mar 2017 21:00:29 +0000 (14:00 -0700)]
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
Stephen Chen [Wed, 29 Mar 2017 00:20:41 +0000 (17:20 -0700)]
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
jackqdyulei [Wed, 15 Mar 2017 22:13:10 +0000 (15:13 -0700)]
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
Yohei Yukawa [Tue, 28 Mar 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Set flagForceAscii for device password entries" into oc-dev am:
ef34273654
am:
6c4d4600e3
Change-Id: Ifd213e69ff9dce07da1ccdf93698051a3447cb02
Yohei Yukawa [Tue, 28 Mar 2017 23:27:45 +0000 (23:27 +0000)]
Merge "Set flagForceAscii for device password entries" into oc-dev
am:
ef34273654
Change-Id: Id4334fbb8911a7d826c547004773e03ef90f69d1
TreeHugger Robot [Tue, 28 Mar 2017 23:21:00 +0000 (23:21 +0000)]
Merge "Set flagForceAscii for device password entries" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 23:11:40 +0000 (23:11 +0000)]
Merge "Use buttons for EncryptionInterstitial"
Amin Shaikh [Tue, 28 Mar 2017 20:48:36 +0000 (20:48 +0000)]
Merge "Remove delayed processing of UI events in onStop" into oc-dev am:
0f1d2bb81c
am:
c8238c7fb9
Change-Id: I5ff3050197f938bbea5a59ac5e4db9e875cfff85
Amin Shaikh [Tue, 28 Mar 2017 20:43:36 +0000 (20:43 +0000)]
Merge "Remove delayed processing of UI events in onStop" into oc-dev
am:
0f1d2bb81c
Change-Id: Ic5da1d4a885a827cc01e19e14ebe07f5b9408044
TreeHugger Robot [Tue, 28 Mar 2017 20:38:24 +0000 (20:38 +0000)]
Merge "Remove delayed processing of UI events in onStop" into oc-dev
Doris Ling [Tue, 28 Mar 2017 20:21:52 +0000 (20:21 +0000)]
Revert "Convert BT preference to use TwoTargetPreference" am:
457c3cbec2
am:
6226a2b825
Change-Id: I3b3ab282b7f58c52baad57f3fa1fe51a090372ec
Doris Ling [Tue, 28 Mar 2017 20:14:03 +0000 (20:14 +0000)]
Revert "Convert BT preference to use TwoTargetPreference"
am:
457c3cbec2
Change-Id: I7c2bae70c0ec5d94dcf962ab98159ace751b7571
TreeHugger Robot [Tue, 28 Mar 2017 20:13:55 +0000 (20:13 +0000)]
Merge "Add null check for the media player when surface texture is available."
Doris Ling [Tue, 28 Mar 2017 19:53:31 +0000 (19:53 +0000)]
Revert "Convert BT preference to use TwoTargetPreference"
This reverts commit
09c7f15b121a531b17e39ba1dd3f54ae42472e3d.
Change-Id: I29aa67f026c0b54da08b19657f9916275e5a3459
TreeHugger Robot [Tue, 28 Mar 2017 19:26:58 +0000 (19:26 +0000)]
Merge "Hide Wifi and Systemui in settings main page"
TreeHugger Robot [Tue, 28 Mar 2017 19:14:17 +0000 (19:14 +0000)]
Merge "OMADM Trigger in *#*#INFO#*#* hidden menu."
Amin Shaikh [Tue, 28 Mar 2017 18:41:32 +0000 (11:41 -0700)]
Remove delayed processing of UI events in onStop
Bug:
36682492
Test: manually; test tracking in b/
36403635
Change-Id: Ia369cd61a6473ae2af4891cf6b923900504921c1
Doris Ling [Tue, 28 Mar 2017 19:03:29 +0000 (19:03 +0000)]
Add null check for the media player when surface texture is available. am:
6709b6d399
am:
abae2cf608
Change-Id: I501c20a178959a9c3661351cc479e20511ca2d41
Doris Ling [Tue, 28 Mar 2017 18:49:44 +0000 (18:49 +0000)]
Add null check for the media player when surface texture is available.
am:
6709b6d399
Change-Id: Ia22b9ea654ff19a7dbe36e6da6c285e542d3c151
Alex Salo [Tue, 28 Mar 2017 18:47:14 +0000 (18:47 +0000)]
Merge "Changed the string describing location state "Device only" to be more precise and let users know that we are using device sensors in addition to the GPS."
Doris Ling [Mon, 27 Mar 2017 23:14:01 +0000 (16:14 -0700)]
Increase the char limit for the bluetooth tethering strings.
Longer summary text for the bluetooth tethering should be supported for
translation to other languages.
Bug:
36626585
Bug:
36627493
Bug:
36635108
Test: builds
Change-Id: Ia1409520443fd05c54a6c28fc292dd39b1c198b2
Doris Ling [Tue, 28 Mar 2017 18:14:34 +0000 (11:14 -0700)]
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
Doris Ling [Tue, 28 Mar 2017 18:14:34 +0000 (11:14 -0700)]
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
Youhan Wang [Fri, 16 Dec 2016 23:53:16 +0000 (15:53 -0800)]
OMADM Trigger in *#*#INFO#*#* hidden menu.
Test: make
Bug:
32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
Doris Ling [Tue, 28 Mar 2017 17:55:11 +0000 (17:55 +0000)]
Merge "Fix null pointer on dismissing suggestion."
Doris Ling [Mon, 27 Mar 2017 21:34:30 +0000 (14:34 -0700)]
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
jackqdyulei [Mon, 27 Mar 2017 23:38:47 +0000 (16:38 -0700)]
Hide Wifi and Systemui in settings main page
Also move the systemui to category system
Fix:
36644740
Fix:
36645264
Test: RunSettingsRoboTests
Change-Id: I6b64a7dca58091f3a1d8b7d99c8bae7ddf9169f9
Daniel Nishi [Tue, 28 Mar 2017 17:00:54 +0000 (17:00 +0000)]
Merge "Re-add the option to migrate data back."
Amin Shaikh [Tue, 28 Mar 2017 16:58:21 +0000 (16:58 +0000)]
Use Collator to sort saved networks. am:
32924e2f58
am:
fe5d2ee936
Change-Id: I463189b11a896ed9790c4499a9387eee1600034d
Amin Shaikh [Tue, 28 Mar 2017 16:46:51 +0000 (16:46 +0000)]
Use Collator to sort saved networks.
am:
32924e2f58
Change-Id: I4a512a3e1424977d6f1085eb4a62f2ece19b61b7
Yohei Yukawa [Tue, 21 Mar 2017 23:47:20 +0000 (16:47 -0700)]
Set flagForceAscii for device password entries
Since the beginning [1], ChooseLockPassword#validatePassword() has never
accepted non-ASCII characters [2]. Hence we can safely specify
EditorInfo#IME_FLAG_FORCE_ASCII so that IMEs can optimize their UX based
on this flag. Note that EditorInfo#IME_FLAG_FORCE_ASCII is just a hint
for the IME so there should be no behavior change in the system side.
Note also that EditorInfo#IME_FLAG_FORCE_ASCII has been used in KeyGuard
(keyguard_password_view.xml) since JB MR-1 [3] so this flag is considered
to be well tested.
[1]:
00d2476d8fc122b4eef59d6be6f7aa41e9c56fde
[2]: Only character c where 32 <= c <= 126 is accepted
[3]: Id75286113771ca1407e9db182172b580f870b612
Test: Run `adb shell dumpsys input_method` when the password entry
field is focused to make sure that 'imeOptions' parameter
has 0x80000000 bit. Tested the following scenarios:
- PIN on a direct-boot disabled device
- PIN on a direct-boot enabled device
- Password on a direct-boot disabled device
- Password on a direct-boot enabled device
Fixes:
27858858
Change-Id: I3075e24c6dac4d49f4d0e56a0d4d8434a323754d
Amin Shaikh [Tue, 28 Mar 2017 01:07:46 +0000 (18:07 -0700)]
Use Collator to sort saved networks.
Bug:
36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
(cherry picked from commit
0c0fc19aef603470fc42ca33771e57c3656510eb)
TreeHugger Robot [Tue, 28 Mar 2017 16:25:52 +0000 (16:25 +0000)]
Merge "Use Collator to sort saved networks."
tiansiming [Tue, 7 Mar 2017 02:46:13 +0000 (10:46 +0800)]
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>
Noah Wang [Fri, 24 Mar 2017 10:11:15 +0000 (03:11 -0700)]
Adding help links to font size and display settings screens.
bug:
33110518
Change-Id: I5b75adc493ed0ab16a2dd653554af7a7c6e137ad
fen wang [Tue, 28 Mar 2017 05:19:49 +0000 (05:19 +0000)]
Merge "Initialize LDAC to ABR mode" am:
f80b445166 am:
8bed25af1f
am:
9660f0ee80
Change-Id: I4ff3e93ae7093deb94006c4ddf651045a1c0ad13
fen wang [Tue, 28 Mar 2017 05:11:38 +0000 (05:11 +0000)]
Merge "Initialize LDAC to ABR mode" am:
f80b445166
am:
8bed25af1f
Change-Id: Iab167bc1688e87ea0aeb44853dda3854d1601fc9
fen wang [Tue, 28 Mar 2017 05:03:43 +0000 (05:03 +0000)]
Merge "Initialize LDAC to ABR mode"
am:
f80b445166
Change-Id: If89ff9a484b13a61e783c0eaf251e6fd9fbb6ea8
Treehugger Robot [Tue, 28 Mar 2017 04:54:19 +0000 (04:54 +0000)]
Merge "Initialize LDAC to ABR mode"
TreeHugger Robot [Tue, 28 Mar 2017 02:05:49 +0000 (02:05 +0000)]
Merge "Changed Night display strings to "Night Light""
Amin Shaikh [Tue, 28 Mar 2017 01:07:46 +0000 (18:07 -0700)]
Use Collator to sort saved networks.
Bug:
36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
fen wang [Mon, 13 Mar 2017 10:57:25 +0000 (19:57 +0900)]
Initialize LDAC to ABR mode
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Steven Moreland [Tue, 28 Mar 2017 01:27:24 +0000 (01:27 +0000)]
Merge "Revert "Development Options: toggle binderized hals"" am:
21de66bc0c am:
68b580f346
am:
efb7925e7a
Change-Id: I0d97c4ecfb4cd04ee0a19468c0c8382e61f4ae79
TreeHugger Robot [Tue, 28 Mar 2017 01:22:46 +0000 (01:22 +0000)]
Merge "Changes to installed app details screen for instant apps"
Steven Moreland [Tue, 28 Mar 2017 01:21:58 +0000 (01:21 +0000)]
Merge "Revert "Development Options: toggle binderized hals"" am:
21de66bc0c
am:
68b580f346
Change-Id: I95ed12e6c619397a1434d30c714f8f8424036647
Steven Moreland [Tue, 28 Mar 2017 01:18:00 +0000 (01:18 +0000)]
Merge "Revert "Development Options: toggle binderized hals""
am:
21de66bc0c
Change-Id: If9288dda590a4f7fe5a60faeec695045e038ead1
Treehugger Robot [Tue, 28 Mar 2017 01:12:13 +0000 (01:12 +0000)]
Merge "Revert "Development Options: toggle binderized hals""
TreeHugger Robot [Tue, 28 Mar 2017 00:46:52 +0000 (00:46 +0000)]
Merge "Update settings tests to use new constructor."
TreeHugger Robot [Tue, 28 Mar 2017 00:31:05 +0000 (00:31 +0000)]
Merge "Fix forget button on wifi details page."
TreeHugger Robot [Mon, 27 Mar 2017 23:35:44 +0000 (23:35 +0000)]
Merge "Move automatic rules to main DND settings page."
Amin Shaikh [Mon, 27 Mar 2017 17:24:49 +0000 (10:24 -0700)]
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
Maurice Lam [Thu, 23 Mar 2017 21:58:56 +0000 (14:58 -0700)]
Add DEFERRED_SETUP as exclusive suggestion
Add the suggestion category DEFERRED_SETUP, and mark as exclusive
which will prevent suggestions from other categories to be shown when
this is available.
Test: Manual
Bug:
35668836
Change-Id: I2b8ddb65482a39ce8bcb2d673af5dfec759b40c8
Daniel Nishi [Mon, 27 Mar 2017 22:20:08 +0000 (22:20 +0000)]
Merge "Badge the icons for profile storage screen."
Antony Sargent [Wed, 8 Mar 2017 22:34:10 +0000 (14:34 -0800)]
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
Sean Stout [Mon, 27 Mar 2017 20:59:09 +0000 (13:59 -0700)]
Changed Night display strings to "Night Light"
Bug:
34900174
Test: manual
Change-Id: Ia7757474b34c5dae3335102c598bc7f1f0da5a75
Daniel Nishi [Thu, 2 Mar 2017 23:58:23 +0000 (15:58 -0800)]
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
Doris Ling [Mon, 27 Mar 2017 20:38:24 +0000 (20:38 +0000)]
Merge "Fix crash when selecting Settings->Display->Brightness level."
Maurice Lam [Mon, 27 Mar 2017 20:27:21 +0000 (20:27 +0000)]
Merge "Support center alignment"
Doris Ling [Mon, 27 Mar 2017 20:22:19 +0000 (13:22 -0700)]
Fix crash when selecting Settings->Display->Brightness level.
System UI updated the intent string for launching the brightness dialog.
Update the corresponding intent in the settings manifest to match the
change.
Change-Id: I4f8a2d5f424b2a0613d77ff7ca69a9c6237ef8fe
Fix:
36647069
Test: manual
TreeHugger Robot [Mon, 27 Mar 2017 20:04:21 +0000 (20:04 +0000)]
Merge "Expand Wifi Picker Menu by default."
Julia Reynolds [Wed, 22 Mar 2017 18:05:46 +0000 (14:05 -0400)]
Move automatic rules to main DND settings page.
Change-Id: I32b103714d4864ab32e2c85d86106dc118f9c338
Fixes:
31050255
Test: manual
Stephen Chen [Mon, 27 Mar 2017 18:26:46 +0000 (11:26 -0700)]
Expand Wifi Picker Menu by default.
Bug:
36575182
Test: make SettingsFunctionalTests and ran tests on device.
Change-Id: I256ea82a8e4478d81497b9a56cc4fb7755839f1c
Jeff Davidson [Mon, 27 Mar 2017 17:17:43 +0000 (10:17 -0700)]
Fix build breakage in branches downstream of
R.string.background_activity_summary was deleted in master, but is
still referenced by res/xml/power_usage_details.xml. master builds
because the stale translations are currently still present, but will
suddenly fail to build as soon as the translations are updated.
Downstream branches of master which don't have translations configured
are already broken.
Reintroduce the old string to fix the builds.
Change-Id: I20c6aa41c97644a2733ff92a459587e3cb6bf7a0
Test: Will rely on TreeHugger
Fixes:
36619997
Robin Lee [Mon, 27 Mar 2017 16:35:34 +0000 (17:35 +0100)]
resolve merge conflicts of
90f009ebb5 to master
Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46
Robin Lee [Mon, 27 Mar 2017 16:25:24 +0000 (16:25 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled" am:
fb81f50c27
am:
c834ed1e4e
Change-Id: I32ddda40ed4654288eef45dfdb2f53b2f9aba988
Robin Lee [Mon, 27 Mar 2017 16:22:56 +0000 (16:22 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
am:
fb81f50c27
Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
Robin Lee [Mon, 27 Mar 2017 16:18:19 +0000 (16:18 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
TreeHugger Robot [Mon, 27 Mar 2017 15:48:54 +0000 (15:48 +0000)]
Merge "Populate summary for top level wifi picker options"
TreeHugger Robot [Sat, 25 Mar 2017 20:35:02 +0000 (20:35 +0000)]
Merge "Add strings that will be needed for screen saver settings"
TreeHugger Robot [Sat, 25 Mar 2017 18:30:35 +0000 (18:30 +0000)]
Merge "Update Sound settings."
TreeHugger Robot [Sat, 25 Mar 2017 18:21:02 +0000 (18:21 +0000)]
Merge "Update storage summary text."
TreeHugger Robot [Sat, 25 Mar 2017 18:17:14 +0000 (18:17 +0000)]
Merge "Move reset options to one place"
TreeHugger Robot [Sat, 25 Mar 2017 17:54:48 +0000 (17:54 +0000)]
Merge "Change default value for vibrate on touch to 0 (off)."
TreeHugger Robot [Sat, 25 Mar 2017 14:58:45 +0000 (14:58 +0000)]
Merge "Fix Accessibility Settings crash"
Robin Lee [Sat, 25 Mar 2017 11:15:25 +0000 (11:15 +0000)]
Merge "UserCredentialsSettings: that fresh new blank look"
TreeHugger Robot [Sat, 25 Mar 2017 07:40:09 +0000 (07:40 +0000)]
Merge "Add new adaptive brightness strings."