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
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
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
2018-04-19 10:47:22 -07:00
Beverly Tai
83cbcbb72a
Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
...
am: ee3164bd42
2018-04-19 10:30:43 -07:00
Lei Yu
bbf793460b
Merge "update checkbox based on FAS API" into pi-dev
...
am: cff99cc2e3
2018-04-19 10:21:05 -07:00
Beverly Tai
ee3164bd42
Merge "Can disable checkbox without tint on text" into pi-dev
...
am: 48831c837f
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
2018-04-19 06:34:46 -07:00
Jason Monk
23ba6152aa
Merge "Fix wifi launch intent" into pi-dev
...
am: 7f50a0c837
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
2018-04-19 01:41:54 -07:00
CY Cheng
7193ba6d5e
Merge "Remove dynamic summaries for "Screen lock"" into pi-dev
...
am: 27b8c6103f
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
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
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
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
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
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
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
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
2018-04-18 12:49:47 -07:00
Julia Reynolds
8aa8f34b36
Expand channel settings if coming from app am: f3290eafce
...
am: 520fde650d
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
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
2018-04-18 11:37:50 -07:00
Julia Reynolds
520fde650d
Expand channel settings if coming from app
...
am: f3290eafce
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
Katsiaryna Naliuka
79019e474d
Increase number of lines before the fold to make sure Now Playing is visible.
...
Change-Id: Ic9a891f6b44f2b5e057b35f4dca6f2063231449f
Fixes: 64065365
Test: flashed locally built image and tested manually.
2018-04-18 20:03:10 +02:00
Lei Yu
98eb902ead
update checkbox based on FAS API
...
Before this CL, we assumed all the apps in this page were restricted and
didn't consider that user may uncheck one and rotate the screen.
In this CL, when we create checkbox, we will update the state through
FAS API to make sure checkbox is up-to-date.
Change-Id: I4e89908591f0688b4170806db4b6631bf921f2e9
Fixes: 78161466
Test: RunSettingsRoboTests
2018-04-18 10:58:06 -07:00
TreeHugger Robot
07b361c40f
Merge "Convert Blink light to TogglePreferenceController"
2018-04-18 17:49:52 +00:00
Julia Reynolds
f3290eafce
Expand channel settings if coming from app
...
Test: manual inspection
Change-Id: I2ed7f5cc2355f27e0edf36a0d8ee23e418eafd99
Fixes: 77648459
2018-04-18 12:17:33 -04:00
Jason Monk
28af23680e
Fix wifi launch intent
...
Test: manual
Bug: 76162313
Change-Id: Ie4d4235026ed72afc68f0e513ec34c8f188badb9
2018-04-18 10:54:35 -04:00
Anton Hansson
c7ea5e0529
[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module." am: ea74edc9c5 am: cb64305ad3 -s ours
...
am: 9664c8f296
2018-04-18 05:37:04 -07:00
Anton Hansson
9664c8f296
[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module." am: ea74edc9c5
...
am: cb64305ad3
2018-04-18 05:31:21 -07:00
Anton Hansson
cb64305ad3
Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
...
am: ea74edc9c5
2018-04-18 05:24:47 -07:00
