Commit Graph

45620 Commits

Author SHA1 Message Date
Salvador Martinez
9d03322d2c Merge "Fix restricted fragment dialogs" into pi-dev am: dbe38b09cf
am: c1b16f62ad

Change-Id: I32ec3d32e067f03f63335292c7541253bfe372ff
2018-04-19 13:25:14 -07:00
Salvador Martinez
c1b16f62ad Merge "Fix restricted fragment dialogs" into pi-dev
am: dbe38b09cf

Change-Id: I2f84cc758efc3e8de5912cad39ec16454683a2a3
2018-04-19 13:17:35 -07:00
Jeff Sharkey
de7d61b301 Merge "Find graceful description when missing disk." into pi-dev am: 676e86d7fa
am: c890ca54ee

Change-Id: I1b717e497134ffd2b68c936be4e17b800cf10f5a
2018-04-19 13:11:29 -07:00
Salvador Martinez
dbe38b09cf Merge "Fix restricted fragment dialogs" into pi-dev 2018-04-19 20:09:08 +00:00
Jeff Sharkey
c890ca54ee Merge "Find graceful description when missing disk." into pi-dev
am: 676e86d7fa

Change-Id: Iadf3622d3cb5584da367b5efe4e28d376b679a45
2018-04-19 13:07:54 -07:00
Jeff Sharkey
676e86d7fa Merge "Find graceful description when missing disk." into pi-dev 2018-04-19 20:03:24 +00:00
Jan Nordqvist
2eed1c3947 Merge "Updated string char-limits to better match available space for data usage." into pi-dev am: 0454317643
am: ebfe3a9fd6

Change-Id: I3408888a7d0e89aec88658e4ad0742b3011906c9
2018-04-19 11:50:11 -07:00
Jan Nordqvist
ebfe3a9fd6 Merge "Updated string char-limits to better match available space for data usage." into pi-dev
am: 0454317643

Change-Id: I4ef295e377282c7a38dbce44fca0e92395fa5395
2018-04-19 11:40:36 -07:00
TreeHugger Robot
0454317643 Merge "Updated string char-limits to better match available space for data usage." into pi-dev 2018-04-19 18:28:54 +00:00
Lei Yu
646698c7ab Merge "update checkbox based on FAS API" into pi-dev am: cff99cc2e3
am: bbf793460b

Change-Id: I7709702e12d28e7403e134c9da65d8735e54dcf6
2018-04-19 10:47:22 -07:00
Lei Yu
df5beee68b Hook up Adaptive Battery to new flag.
APP_STANDBY_ENABLED is controlled by server side to do experiment.
Before this CL, Adaptive Battery is hooked up to this flag, so
even though if user turns it off, it may be turned on by server.

Add a high level ADAPTIVE_BATTERY_MANAGEMENT_ENABLED to control
the feature in settings UI side.

Bug: 78153913
Test: RunSettingsRoboTests
Change-Id: I1a18d622ddc31ec4d45db918bf981516fbb926c1
2018-04-19 10:46:37 -07:00
Beverly Tai
83cbcbb72a Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
am: ee3164bd42

Change-Id: I63a71e144fd3b93c2c9b285cd637ba656092fa79
2018-04-19 10:30:43 -07:00
Lei Yu
bbf793460b Merge "update checkbox based on FAS API" into pi-dev
am: cff99cc2e3

Change-Id: I556fdf252bef54840dc9ec2fe4a43a991517cab2
2018-04-19 10:21:05 -07:00
Beverly Tai
ee3164bd42 Merge "Can disable checkbox without tint on text" into pi-dev
am: 48831c837f

Change-Id: I1a006094735f5d18e7fc8aeb843bac6736613af8
2018-04-19 10:18:05 -07:00
Lei Yu
cff99cc2e3 Merge "update checkbox based on FAS API" into pi-dev 2018-04-19 17:01:23 +00:00
Beverly Tai
48831c837f Merge "Can disable checkbox without tint on text" into pi-dev 2018-04-19 16:57:05 +00:00
Jeff Chang
224d2c2e6a Merge "The Google specific bits should not in AOSP tests." 2018-04-19 16:42:03 +00:00
Jeff Sharkey
d98de2e2da Find graceful description when missing disk.
Certain volumes (like internal storage) don't have a corresponding
DiskInfo object, so we need to fall back to using the VolumeInfo
description instead.

Bug: 77991425
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I92d377035b6028dd31527100da54bfb1d1828ae9
2018-04-19 09:45:31 -06:00
Julia Reynolds
e2897aedf5 Fix crash on rotation
Load app/channel data early so that any open dialogs can be properly
reconstructed. Never call done on an entityheadercontroller with
an activity that's not yet started.

Test: robotests
Change-Id: Ib2b9f8f1985ef038959062204aaceff686f4ebcf
Fixes: 74114917
2018-04-19 10:17:23 -04:00
Jason Monk
8aa0365d97 Merge "Fix wifi launch intent" into pi-dev am: 7f50a0c837
am: 23ba6152aa

Change-Id: Ic1a1156ba8f05ca8ffeb19cae05c871b45d9c293
2018-04-19 06:34:46 -07:00
Jason Monk
23ba6152aa Merge "Fix wifi launch intent" into pi-dev
am: 7f50a0c837

Change-Id: I66b0cd219442fd8f47479e23b0af52f3cfed90b5
2018-04-19 06:29:30 -07:00
Beverly
49f7f8137f Can disable checkbox without tint on text
Fixes: 76101594
Test: DisabledCheckBoxPreferenceTest, ZenModeVisEffectPreferenceControllerTest
Change-Id: Ida92c7d94f788404d9cd48f07e779446d9ac0d54
2018-04-19 09:27:22 -04:00
TreeHugger Robot
7f50a0c837 Merge "Fix wifi launch intent" into pi-dev 2018-04-19 13:23:20 +00:00
CY Cheng
775383c291 Merge "Remove dynamic summaries for "Screen lock"" into pi-dev am: 27b8c6103f
am: 7193ba6d5e

Change-Id: I34c4e8adb5b8d8defe45473304aeea66425f1747
2018-04-19 01:41:54 -07:00
CY Cheng
7193ba6d5e Merge "Remove dynamic summaries for "Screen lock"" into pi-dev
am: 27b8c6103f

Change-Id: Ia92d5f54874e9cd1de5060c8bd11b30b4a1947ce
2018-04-19 01:37:22 -07:00
CY Cheng
27b8c6103f Merge "Remove dynamic summaries for "Screen lock"" into pi-dev 2018-04-19 08:29:29 +00:00
Ivan Chiang
f2f03b8198 Add DockUpdaterFeatureProvider and DockUpdater.
Add the new feature components for dock devices.

Bug: 77931823
Test: Build
Change-Id: I219a5256d02f2b1b8ea7cce1cff4219975f2eae2
2018-04-19 16:04:08 +08:00
CY Cheng
a7648f0a60 Remove dynamic summaries for "Screen lock"
By replacing default summary string with placeholder in xml, the search
index db will add the placeholder as summary instead. This prevents
SettingsIntelligence displaying the search result with a fixed summary,
which may inconsistent with current settings status.

Fixes: 73254496
Test: RunSettingsRoboTests
Change-Id: Ifae8a787ce63fa7a6c7ad5749dab7db72be0263f
2018-04-19 05:58:03 +00:00
TreeHugger Robot
f89e9e4174 Merge "Modified the PrivacySettings and add PreferenceControllers" 2018-04-19 02:39:28 +00:00
TreeHugger Robot
6280bdb437 Merge "Use ListFormatter to join strings for network dashboard" 2018-04-19 01:51:29 +00:00
Salvador Martinez
950d94f689 Update settings main page battery string
UX requested that the percentage be moved to the front.

Test: robotests pass
Bug: 77874406
Change-Id: I7008c81fa42487bb71ecd84b6a66203d89fe50a8
2018-04-18 18:26:36 -07:00
Salvador Martinez
8c975b7bc0 Fix restricted fragment dialogs
The dialog for a setting being restricted was showing even when the
password was being entered correctly. This CL makes it so that
if the password is correctly entered we dismiss the dialog if it
is up.

Test: robotests
Bug: 77722622
Change-Id: Ifc82bc1e5800afff2a0883a13bf316f84169d80d
2018-04-18 18:04:13 -07:00
sunnyshao
15ec2cf8ef Modified the PrivacySettings and add PreferenceControllers
- Changed the PrivacySettings to DashboardFragment.
- Added the new five related PreferenceControllers and related codes
- Modified the privacy_settings.xml
- Removed the PrivacySettingsTest test by design changed
- Moved the PrivacySettings.java from root directory to backup

Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ic88e2e58a11d024d2394f75c3db5b46fe2d86dba
2018-04-18 18:02:53 -07:00
Fan Zhang
c83ebf15e5 Merge "Bidi wrap owner name in account setting page." into pi-dev am: 8a3bcaa3e3
am: 4a8acacde0

Change-Id: Ie26828f23d760af36f922a66c0b7c45f8a7e4945
2018-04-18 17:47:11 -07:00
Fan Zhang
4db6aac464 Use ListFormatter to join strings for network dashboard
Test: robotests
Change-Id: Ie15512acb35c185f9a59bf268303b7993cc40947
2018-04-19 00:40:53 +00:00
Fan Zhang
4a8acacde0 Merge "Bidi wrap owner name in account setting page." into pi-dev
am: 8a3bcaa3e3

Change-Id: I76c750048387a0886a5dbf4cd3de3fde5ccc56d0
2018-04-18 17:38:27 -07:00
Jan Nordqvist
d19398abae Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev am: 27441a984a
am: 6bc28cdb51

Change-Id: If762696a406b96cb4cdc8a30bcd1b8d70db2804b
2018-04-18 17:26:52 -07:00
TreeHugger Robot
8a3bcaa3e3 Merge "Bidi wrap owner name in account setting page." into pi-dev 2018-04-19 00:24:53 +00:00
Jan Nordqvist
6bc28cdb51 Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev
am: 27441a984a

Change-Id: I90e65a96e1ca6a101d6b120006822f7dedbd24bd
2018-04-18 17:12:44 -07:00
TreeHugger Robot
27441a984a Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev 2018-04-18 23:49:31 +00:00
Fan Zhang
fa9849e282 Bidi wrap owner name in account setting page.
This fixes RTL issue when owner is set to have a LTR name but the
device language is in RTL.

Change-Id: I9f3fed76f641c2ff6a18e3bc8db98aef7011c33f
Fixes: 77947484
Test: visual
2018-04-18 15:58:50 -07:00
Katsiaryna Naliuka
1e88121589 Merge "Increase number of lines before the fold to make sure Now Playing is visible." into pi-dev am: e898c75844
am: db933db278

Change-Id: Ie067d2bcd1258b08a5f1cedb0d3518b2f873ae77
2018-04-18 12:56:46 -07:00
Lei Yu
cbb6836e68 Merge "Force update all suggestions but app restriction" into pi-dev am: 68ef601059
am: 5f3bacea9c

Change-Id: I1b68483b257b81f723e46badb18a94b1b7335f8c
2018-04-18 12:49:47 -07:00
Julia Reynolds
8aa8f34b36 Expand channel settings if coming from app am: f3290eafce
am: 520fde650d

Change-Id: I056fa1ed816ec1ef0b898ab18471f5dfe6c9613f
2018-04-18 12:31:19 -07:00
Katsiaryna Naliuka
db933db278 Merge "Increase number of lines before the fold to make sure Now Playing is visible." into pi-dev
am: e898c75844

Change-Id: Ie0ad5e7b5231d46fa7a70549e47551e2f20eaaa7
2018-04-18 12:30:46 -07:00
Jan Nordqvist
34d01a1474 Updated string char-limits to better match available space for data usage.
Bug: 77641038

Test: manual
Change-Id: Ie78d57f6527c36bdc4bdc297e9184d687f78bb1b
2018-04-18 12:30:38 -07:00
TreeHugger Robot
e898c75844 Merge "Increase number of lines before the fold to make sure Now Playing is visible." into pi-dev 2018-04-18 19:02:38 +00:00
Lei Yu
5f3bacea9c Merge "Force update all suggestions but app restriction" into pi-dev
am: 68ef601059

Change-Id: I4c536e9c4b8bd8935e6c5b455c65f28567a20394
2018-04-18 11:37:50 -07:00
Julia Reynolds
520fde650d Expand channel settings if coming from app
am: f3290eafce

Change-Id: I4e84efc05de679a5a001603b58d7e3de4824d93d
2018-04-18 11:28:35 -07:00
TreeHugger Robot
68ef601059 Merge "Force update all suggestions but app restriction" into pi-dev 2018-04-18 18:09:58 +00:00