OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Migrate LegalSettings to DashboardFragment"
TreeHugger Robot [Thu, 19 Apr 2018 22:36:09 +0000 (22:36 +0000)]
Merge "Migrate LegalSettings to DashboardFragment"

6 years agoMigrate LegalSettings to DashboardFragment
Yanting_Yang [Wed, 11 Apr 2018 13:21:17 +0000 (21:21 +0800)]
Migrate LegalSettings to DashboardFragment

- CopyrightPreferenceController
- LegalPreferenceController
- LicensePreferenceController
- TermsPreferenceController
- WallpaperAttributionsPreferenceController
- WebViewLicensePreferenceController

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
      make RunSettingsRoboTests -j ROBOTEST_FILTER=CodeInspectionTest
      atest UniquePreferenceTest

Change-Id: I28108eb926f9efec63390c2354cb0ebc0a785ec2

6 years agoChange base fragment to InstrumentedFragment
rafftsai [Fri, 13 Apr 2018 06:52:59 +0000 (14:52 +0800)]
Change base fragment to InstrumentedFragment

- Modify PrivateVolumeForget, PrivateVolumeFormat, PrivateVolumeUnmount
- Add ShadowStorageManager
- Add test cases

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo

Change-Id: I6883dd12cec00abbc3099bf31d285e6fe455eba6

6 years agoMerge "Fix restricted fragment dialogs" into pi-dev am: dbe38b09cf
Salvador Martinez [Thu, 19 Apr 2018 20:25:14 +0000 (13:25 -0700)]
Merge "Fix restricted fragment dialogs" into pi-dev am: dbe38b09cf
am: c1b16f62ad

Change-Id: I32ec3d32e067f03f63335292c7541253bfe372ff

6 years agoMerge "Fix restricted fragment dialogs" into pi-dev
Salvador Martinez [Thu, 19 Apr 2018 20:17:35 +0000 (13:17 -0700)]
Merge "Fix restricted fragment dialogs" into pi-dev
am: dbe38b09cf

Change-Id: I2f84cc758efc3e8de5912cad39ec16454683a2a3

6 years agoMerge "Find graceful description when missing disk." into pi-dev am: 676e86d7fa
Jeff Sharkey [Thu, 19 Apr 2018 20:11:29 +0000 (13:11 -0700)]
Merge "Find graceful description when missing disk." into pi-dev am: 676e86d7fa
am: c890ca54ee

Change-Id: I1b717e497134ffd2b68c936be4e17b800cf10f5a

6 years agoMerge "Fix restricted fragment dialogs" into pi-dev
Salvador Martinez [Thu, 19 Apr 2018 20:09:08 +0000 (20:09 +0000)]
Merge "Fix restricted fragment dialogs" into pi-dev

6 years agoMerge "Find graceful description when missing disk." into pi-dev
Jeff Sharkey [Thu, 19 Apr 2018 20:07:54 +0000 (13:07 -0700)]
Merge "Find graceful description when missing disk." into pi-dev
am: 676e86d7fa

Change-Id: Iadf3622d3cb5584da367b5efe4e28d376b679a45

6 years agoMerge "Find graceful description when missing disk." into pi-dev
Jeff Sharkey [Thu, 19 Apr 2018 20:03:24 +0000 (20:03 +0000)]
Merge "Find graceful description when missing disk." into pi-dev

6 years agoMerge "Updated string char-limits to better match available space for data usage...
Jan Nordqvist [Thu, 19 Apr 2018 18:50:11 +0000 (11:50 -0700)]
Merge "Updated string char-limits to better match available space for data usage." into pi-dev am: 0454317643
am: ebfe3a9fd6

Change-Id: I3408888a7d0e89aec88658e4ad0742b3011906c9

6 years agoMerge "Updated string char-limits to better match available space for data usage...
Jan Nordqvist [Thu, 19 Apr 2018 18:40:36 +0000 (11:40 -0700)]
Merge "Updated string char-limits to better match available space for data usage." into pi-dev
am: 0454317643

Change-Id: I4ef295e377282c7a38dbce44fca0e92395fa5395

6 years agoMerge "Updated string char-limits to better match available space for data usage...
TreeHugger Robot [Thu, 19 Apr 2018 18:28:54 +0000 (18:28 +0000)]
Merge "Updated string char-limits to better match available space for data usage." into pi-dev

6 years agoMerge "update checkbox based on FAS API" into pi-dev am: cff99cc2e3
Lei Yu [Thu, 19 Apr 2018 17:47:22 +0000 (10:47 -0700)]
Merge "update checkbox based on FAS API" into pi-dev am: cff99cc2e3
am: bbf793460b

Change-Id: I7709702e12d28e7403e134c9da65d8735e54dcf6

6 years agoMerge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
Beverly Tai [Thu, 19 Apr 2018 17:30:43 +0000 (10:30 -0700)]
Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
am: ee3164bd42

Change-Id: I63a71e144fd3b93c2c9b285cd637ba656092fa79

6 years agoMerge "update checkbox based on FAS API" into pi-dev
Lei Yu [Thu, 19 Apr 2018 17:21:05 +0000 (10:21 -0700)]
Merge "update checkbox based on FAS API" into pi-dev
am: cff99cc2e3

Change-Id: I556fdf252bef54840dc9ec2fe4a43a991517cab2

6 years agoMerge "Can disable checkbox without tint on text" into pi-dev
Beverly Tai [Thu, 19 Apr 2018 17:18:05 +0000 (10:18 -0700)]
Merge "Can disable checkbox without tint on text" into pi-dev
am: 48831c837f

Change-Id: I1a006094735f5d18e7fc8aeb843bac6736613af8

6 years agoMerge "update checkbox based on FAS API" into pi-dev
Lei Yu [Thu, 19 Apr 2018 17:01:23 +0000 (17:01 +0000)]
Merge "update checkbox based on FAS API" into pi-dev

6 years agoMerge "Can disable checkbox without tint on text" into pi-dev
Beverly Tai [Thu, 19 Apr 2018 16:57:05 +0000 (16:57 +0000)]
Merge "Can disable checkbox without tint on text" into pi-dev

6 years agoMerge "The Google specific bits should not in AOSP tests."
Jeff Chang [Thu, 19 Apr 2018 16:42:03 +0000 (16:42 +0000)]
Merge "The Google specific bits should not in AOSP tests."

6 years agoFind graceful description when missing disk.
Jeff Sharkey [Thu, 19 Apr 2018 15:45:29 +0000 (09:45 -0600)]
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

6 years agoMerge "Fix wifi launch intent" into pi-dev am: 7f50a0c837
Jason Monk [Thu, 19 Apr 2018 13:34:46 +0000 (06:34 -0700)]
Merge "Fix wifi launch intent" into pi-dev am: 7f50a0c837
am: 23ba6152aa

Change-Id: Ic1a1156ba8f05ca8ffeb19cae05c871b45d9c293

6 years agoMerge "Fix wifi launch intent" into pi-dev
Jason Monk [Thu, 19 Apr 2018 13:29:30 +0000 (06:29 -0700)]
Merge "Fix wifi launch intent" into pi-dev
am: 7f50a0c837

Change-Id: I66b0cd219442fd8f47479e23b0af52f3cfed90b5

6 years agoCan disable checkbox without tint on text
Beverly [Wed, 18 Apr 2018 17:45:18 +0000 (13:45 -0400)]
Can disable checkbox without tint on text

Fixes: 76101594
Test: DisabledCheckBoxPreferenceTest, ZenModeVisEffectPreferenceControllerTest
Change-Id: Ida92c7d94f788404d9cd48f07e779446d9ac0d54

6 years agoMerge "Fix wifi launch intent" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 13:23:20 +0000 (13:23 +0000)]
Merge "Fix wifi launch intent" into pi-dev

6 years agoMerge "Remove dynamic summaries for "Screen lock"" into pi-dev am: 27b8c6103f
CY Cheng [Thu, 19 Apr 2018 08:41:54 +0000 (01:41 -0700)]
Merge "Remove dynamic summaries for "Screen lock"" into pi-dev am: 27b8c6103f
am: 7193ba6d5e

Change-Id: I34c4e8adb5b8d8defe45473304aeea66425f1747

6 years agoMerge "Remove dynamic summaries for "Screen lock"" into pi-dev
CY Cheng [Thu, 19 Apr 2018 08:37:22 +0000 (01:37 -0700)]
Merge "Remove dynamic summaries for "Screen lock"" into pi-dev
am: 27b8c6103f

Change-Id: Ia92d5f54874e9cd1de5060c8bd11b30b4a1947ce

6 years agoMerge "Remove dynamic summaries for "Screen lock"" into pi-dev
CY Cheng [Thu, 19 Apr 2018 08:29:29 +0000 (08:29 +0000)]
Merge "Remove dynamic summaries for "Screen lock"" into pi-dev

6 years agoRemove dynamic summaries for "Screen lock"
CY Cheng [Wed, 18 Apr 2018 12:23:57 +0000 (20:23 +0800)]
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

6 years agoMerge "Modified the PrivacySettings and add PreferenceControllers"
TreeHugger Robot [Thu, 19 Apr 2018 02:39:28 +0000 (02:39 +0000)]
Merge "Modified the PrivacySettings and add PreferenceControllers"

6 years agoMerge "Use ListFormatter to join strings for network dashboard"
TreeHugger Robot [Thu, 19 Apr 2018 01:51:29 +0000 (01:51 +0000)]
Merge "Use ListFormatter to join strings for network dashboard"

6 years agoFix restricted fragment dialogs
Salvador Martinez [Thu, 19 Apr 2018 00:38:46 +0000 (17:38 -0700)]
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

6 years agoModified the PrivacySettings and add PreferenceControllers
sunnyshao [Thu, 29 Mar 2018 11:50:20 +0000 (19:50 +0800)]
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

6 years agoMerge "Bidi wrap owner name in account setting page." into pi-dev am: 8a3bcaa3e3
Fan Zhang [Thu, 19 Apr 2018 00:47:11 +0000 (17:47 -0700)]
Merge "Bidi wrap owner name in account setting page." into pi-dev am: 8a3bcaa3e3
am: 4a8acacde0

Change-Id: Ie26828f23d760af36f922a66c0b7c45f8a7e4945

6 years agoUse ListFormatter to join strings for network dashboard
Fan Zhang [Thu, 19 Apr 2018 00:39:48 +0000 (17:39 -0700)]
Use ListFormatter to join strings for network dashboard

Test: robotests
Change-Id: Ie15512acb35c185f9a59bf268303b7993cc40947

6 years agoMerge "Bidi wrap owner name in account setting page." into pi-dev
Fan Zhang [Thu, 19 Apr 2018 00:38:27 +0000 (17:38 -0700)]
Merge "Bidi wrap owner name in account setting page." into pi-dev
am: 8a3bcaa3e3

Change-Id: I76c750048387a0886a5dbf4cd3de3fde5ccc56d0

6 years agoMerge "Fixing incorrect method to launch mobile data plan app." into pi-dev am: 27441...
Jan Nordqvist [Thu, 19 Apr 2018 00:26:52 +0000 (17:26 -0700)]
Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev am: 27441a984a
am: 6bc28cdb51

Change-Id: If762696a406b96cb4cdc8a30bcd1b8d70db2804b

6 years agoMerge "Bidi wrap owner name in account setting page." into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 00:24:53 +0000 (00:24 +0000)]
Merge "Bidi wrap owner name in account setting page." into pi-dev

6 years agoMerge "Fixing incorrect method to launch mobile data plan app." into pi-dev
Jan Nordqvist [Thu, 19 Apr 2018 00:12:44 +0000 (17:12 -0700)]
Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev
am: 27441a984a

Change-Id: I90e65a96e1ca6a101d6b120006822f7dedbd24bd

6 years agoMerge "Fixing incorrect method to launch mobile data plan app." into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 23:49:31 +0000 (23:49 +0000)]
Merge "Fixing incorrect method to launch mobile data plan app." into pi-dev

6 years agoBidi wrap owner name in account setting page.
Fan Zhang [Wed, 18 Apr 2018 22:58:50 +0000 (15:58 -0700)]
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

6 years agoMerge "Increase number of lines before the fold to make sure Now Playing is visible...
Katsiaryna Naliuka [Wed, 18 Apr 2018 19:56:46 +0000 (12:56 -0700)]
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

6 years agoMerge "Force update all suggestions but app restriction" into pi-dev am: 68ef601059
Lei Yu [Wed, 18 Apr 2018 19:49:47 +0000 (12:49 -0700)]
Merge "Force update all suggestions but app restriction" into pi-dev am: 68ef601059
am: 5f3bacea9c

Change-Id: I1b68483b257b81f723e46badb18a94b1b7335f8c

6 years agoExpand channel settings if coming from app am: f3290eafce
Julia Reynolds [Wed, 18 Apr 2018 19:31:19 +0000 (12:31 -0700)]
Expand channel settings if coming from app am: f3290eafce
am: 520fde650d

Change-Id: I056fa1ed816ec1ef0b898ab18471f5dfe6c9613f

6 years agoMerge "Increase number of lines before the fold to make sure Now Playing is visible...
Katsiaryna Naliuka [Wed, 18 Apr 2018 19:30:46 +0000 (12:30 -0700)]
Merge "Increase number of lines before the fold to make sure Now Playing is visible." into pi-dev
am: e898c75844

Change-Id: Ie0ad5e7b5231d46fa7a70549e47551e2f20eaaa7

6 years agoUpdated string char-limits to better match available space for data usage.
Jan Nordqvist [Wed, 18 Apr 2018 19:30:38 +0000 (12:30 -0700)]
Updated string char-limits to better match available space for data usage.

Bug: 77641038

Test: manual
Change-Id: Ie78d57f6527c36bdc4bdc297e9184d687f78bb1b

6 years agoMerge "Increase number of lines before the fold to make sure Now Playing is visible...
TreeHugger Robot [Wed, 18 Apr 2018 19:02:38 +0000 (19:02 +0000)]
Merge "Increase number of lines before the fold to make sure Now Playing is visible." into pi-dev

6 years agoMerge "Force update all suggestions but app restriction" into pi-dev
Lei Yu [Wed, 18 Apr 2018 18:37:50 +0000 (11:37 -0700)]
Merge "Force update all suggestions but app restriction" into pi-dev
am: 68ef601059

Change-Id: I4c536e9c4b8bd8935e6c5b455c65f28567a20394

6 years agoExpand channel settings if coming from app
Julia Reynolds [Wed, 18 Apr 2018 18:28:35 +0000 (11:28 -0700)]
Expand channel settings if coming from app
am: f3290eafce

Change-Id: I4e84efc05de679a5a001603b58d7e3de4824d93d

6 years agoMerge "Force update all suggestions but app restriction" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 18:09:58 +0000 (18:09 +0000)]
Merge "Force update all suggestions but app restriction" into pi-dev

6 years agoIncrease number of lines before the fold to make sure Now Playing is visible.
Katsiaryna Naliuka [Wed, 18 Apr 2018 17:54:41 +0000 (19:54 +0200)]
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.

6 years agoupdate checkbox based on FAS API
Lei Yu [Tue, 17 Apr 2018 20:23:15 +0000 (13:23 -0700)]
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

6 years agoMerge "Convert Blink light to TogglePreferenceController"
TreeHugger Robot [Wed, 18 Apr 2018 17:49:52 +0000 (17:49 +0000)]
Merge "Convert Blink light to TogglePreferenceController"

6 years agoExpand channel settings if coming from app
Julia Reynolds [Wed, 18 Apr 2018 16:17:33 +0000 (12:17 -0400)]
Expand channel settings if coming from app

Test: manual inspection
Change-Id: I2ed7f5cc2355f27e0edf36a0d8ee23e418eafd99
Fixes: 77648459

6 years agoFix wifi launch intent
Jason Monk [Wed, 18 Apr 2018 14:54:35 +0000 (10:54 -0400)]
Fix wifi launch intent

Test: manual
Bug: 76162313
Change-Id: Ie4d4235026ed72afc68f0e513ec34c8f188badb9

6 years ago[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent...
Anton Hansson [Wed, 18 Apr 2018 12:37:04 +0000 (05:37 -0700)]
[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module." am: ea74edc9c5 am: cb64305ad3  -s ours
am: 9664c8f296  -s ours

Change-Id: I502be07897421f697590959deba09fe970859b6a

6 years ago[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent...
Anton Hansson [Wed, 18 Apr 2018 12:31:21 +0000 (05:31 -0700)]
[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module." am: ea74edc9c5
am: cb64305ad3  -s ours

Change-Id: I3629843911d1040f7cab8250050e03c0665a8e5c

6 years agoMerge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
Anton Hansson [Wed, 18 Apr 2018 12:24:47 +0000 (05:24 -0700)]
Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
am: ea74edc9c5

Change-Id: I79d97720c6b4e5f773644d686b06acc9f3e8840d

6 years agoMerge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
Anton Hansson [Wed, 18 Apr 2018 12:02:10 +0000 (12:02 +0000)]
Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."

6 years agoMerge "Fix text alignment in SIM lock dialog." into pi-dev am: 270f608578
Doris Ling [Wed, 18 Apr 2018 06:12:12 +0000 (23:12 -0700)]
Merge "Fix text alignment in SIM lock dialog." into pi-dev am: 270f608578
am: 1255398ed9

Change-Id: I14979288fef3adfc7f714d77d75a721588f00a14

6 years agoMerge "Fix text alignment in SIM lock dialog." into pi-dev
Doris Ling [Wed, 18 Apr 2018 06:05:36 +0000 (23:05 -0700)]
Merge "Fix text alignment in SIM lock dialog." into pi-dev
am: 270f608578

Change-Id: Iaec9e652cdb334ed8d1f9918c8d2ef5296c8b258

6 years agoMerge "Fix text alignment in SIM lock dialog." into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 05:55:35 +0000 (05:55 +0000)]
Merge "Fix text alignment in SIM lock dialog." into pi-dev

6 years agoConvert Blink light to TogglePreferenceController
HJ ChangLiao [Tue, 17 Apr 2018 09:52:55 +0000 (17:52 +0800)]
Convert Blink light to TogglePreferenceController

Convert Blink light (notification) controller:
PulseNotificationPreferenceController
to TogglePreferenceController for slices

Change-Id: I4c49d2d52a5909b45f1a74518aa925abb14e1336
Fixes: 74923755
Test: make RunSettingsRoboTests

6 years agoMerge "Add A11y Slices" into pi-dev am: bc4c392ff4
Matthew Fritze [Wed, 18 Apr 2018 01:54:46 +0000 (18:54 -0700)]
Merge "Add A11y Slices" into pi-dev am: bc4c392ff4
am: c82cf95105

Change-Id: Iabff6994e9a4eb67d2702eb949f6e60939db0508

6 years agoMerge "Remove the divider" into pi-dev am: d119530976
hughchen [Wed, 18 Apr 2018 01:53:52 +0000 (18:53 -0700)]
Merge "Remove the divider" into pi-dev am: d119530976
am: b0cf8a6ea9

Change-Id: Ib07759e3269788d8b406aab1581893c188a43626

6 years agoMerge "Add A11y Slices" into pi-dev
Matthew Fritze [Wed, 18 Apr 2018 01:48:52 +0000 (18:48 -0700)]
Merge "Add A11y Slices" into pi-dev
am: bc4c392ff4

Change-Id: I255331e6b490f29011818feca9ff97e2d37dff1b

6 years agoMerge "Remove the divider" into pi-dev
hughchen [Wed, 18 Apr 2018 01:48:01 +0000 (18:48 -0700)]
Merge "Remove the divider" into pi-dev
am: d119530976

Change-Id: Ic99a52552568a96d04c2b1ec6f6d6dd39ecc1685

6 years agoMerge "Add A11y Slices" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 01:44:58 +0000 (01:44 +0000)]
Merge "Add A11y Slices" into pi-dev

6 years agoMerge "Remove the divider" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 01:41:13 +0000 (01:41 +0000)]
Merge "Remove the divider" into pi-dev

6 years agoMerge "KeyboardLayoutPickerFragment uses DashboardFragment"
TreeHugger Robot [Wed, 18 Apr 2018 01:29:49 +0000 (01:29 +0000)]
Merge "KeyboardLayoutPickerFragment uses DashboardFragment"

6 years agoFixing incorrect method to launch mobile data plan app.
Jan Nordqvist [Wed, 18 Apr 2018 00:31:33 +0000 (17:31 -0700)]
Fixing incorrect method to launch mobile data plan app.

Bug: 77529772

Test: manual
Change-Id: Id102cb11bcbcc94b139caff47195364e281850e3

6 years agoMerge "Identify cast mode properly in audio switch" into pi-dev am: 16f00964a8
ryanywlin [Wed, 18 Apr 2018 01:20:34 +0000 (18:20 -0700)]
Merge "Identify cast mode properly in audio switch" into pi-dev am: 16f00964a8
am: 953af4ed8c

Change-Id: I6fad4cf0fa1a07b9c3ac34370dc2c320bdcc2196

6 years agoMerge "Fix text alignment in supported links dialog." into pi-dev am: 0dc5bcdff6
Doris Ling [Wed, 18 Apr 2018 01:19:57 +0000 (18:19 -0700)]
Merge "Fix text alignment in supported links dialog." into pi-dev am: 0dc5bcdff6
am: b8e04863b8

Change-Id: I30d53776d45a02b5af6828e19900a7d1873086e6

6 years agoMerge "Identify cast mode properly in audio switch" into pi-dev
ryanywlin [Wed, 18 Apr 2018 01:15:03 +0000 (18:15 -0700)]
Merge "Identify cast mode properly in audio switch" into pi-dev
am: 16f00964a8

Change-Id: I14d7c5cf940565bd4171ba23e93b4f2521756fd9

6 years agoMerge "Fix text alignment in supported links dialog." into pi-dev
Doris Ling [Wed, 18 Apr 2018 01:14:27 +0000 (18:14 -0700)]
Merge "Fix text alignment in supported links dialog." into pi-dev
am: 0dc5bcdff6

Change-Id: Ib5e1fa9f62fe4e0df9abfe6935ce43789a0bfddb

6 years agoMerge "Identify cast mode properly in audio switch" into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 01:11:33 +0000 (01:11 +0000)]
Merge "Identify cast mode properly in audio switch" into pi-dev

6 years agoMerge "Clean Sms raw table when resetting network." into pi-dev am: 1340c3283c
Xiangyu/Malcolm Chen [Wed, 18 Apr 2018 01:02:49 +0000 (18:02 -0700)]
Merge "Clean Sms raw table when resetting network." into pi-dev am: 1340c3283c
am: 5227b14762

Change-Id: If945c6118066819cce988bc448c04095cb7f0e93

6 years agoMerge "Fix text alignment in supported links dialog." into pi-dev
TreeHugger Robot [Wed, 18 Apr 2018 01:02:03 +0000 (01:02 +0000)]
Merge "Fix text alignment in supported links dialog." into pi-dev

6 years agoMerge "Clean Sms raw table when resetting network." into pi-dev
Xiangyu/Malcolm Chen [Wed, 18 Apr 2018 00:57:44 +0000 (17:57 -0700)]
Merge "Clean Sms raw table when resetting network." into pi-dev
am: 1340c3283c

Change-Id: Ie3e2bab305ede65e47bfabfa1f5e29100aced5b9

6 years agoMerge "Clean Sms raw table when resetting network." into pi-dev
Xiangyu/Malcolm Chen [Wed, 18 Apr 2018 00:49:34 +0000 (00:49 +0000)]
Merge "Clean Sms raw table when resetting network." into pi-dev

6 years agoKeyboardLayoutPickerFragment uses DashboardFragment
tmfang [Thu, 29 Mar 2018 10:18:59 +0000 (18:18 +0800)]
KeyboardLayoutPickerFragment uses DashboardFragment

- Build a controller to generate a list of preferences and add to screen.
- Move some logic to controller.
- Add some test cases for controller.

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.inputmethod
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
      atest UniquePreferenceTest
Change-Id: I4ebe486ade3439b9814b11866c402dcf881f21a7

6 years agoIdentify cast mode properly in audio switch
ryanywlin [Tue, 17 Apr 2018 10:25:38 +0000 (18:25 +0800)]
Identify cast mode properly in audio switch

- Use STREAM_MUSIC to idetify cast mode

- Use STREAM_MUSIC to detect wired headset

Bug: 78141750
Test: make RunSettingsRoboTests
ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j40

Change-Id: I92273d41d3debfc3d6327c4ca09143a2dd9b1cb6

6 years agoMerge "Replace deprecated APIs in audio switcher." into pi-dev am: a46dd4bd4b
ryanywlin [Tue, 17 Apr 2018 23:36:49 +0000 (16:36 -0700)]
Merge "Replace deprecated APIs in audio switcher." into pi-dev am: a46dd4bd4b
am: 746c972c53

Change-Id: Ie537c98ba03e22fd23df3ba58ba3dc729b58027b

6 years agoFix text alignment in supported links dialog.
Doris Ling [Tue, 17 Apr 2018 23:36:49 +0000 (16:36 -0700)]
Fix text alignment in supported links dialog.

- align the supported link textview at viewStart.

Change-Id: If323ffe1423059b5e37a9fc94606118fac3d0204
Fixes: 78161872
Test: visual

6 years agoMerge "Update preference to set password field" into pi-dev am: 13c45045de
Salvador Martinez [Tue, 17 Apr 2018 23:35:51 +0000 (16:35 -0700)]
Merge "Update preference to set password field" into pi-dev am: 13c45045de
am: 46ed260d0e

Change-Id: I5cecf70da96f7b30659b341f3bdae65fb6b491d5

6 years agoMerge "Fix text alignment with rtl languages in entity header." into pi-dev am: 72982...
Fan Zhang [Tue, 17 Apr 2018 23:33:57 +0000 (16:33 -0700)]
Merge "Fix text alignment with rtl languages in entity header." into pi-dev am: 7298297007
am: 7a9b76f841

Change-Id: I0ca3923539e72d7efd0ce98ddac06c0811b9f60d

6 years agoMerge "Update icon for security settings." into pi-dev am: 3e3b496738
Doris Ling [Tue, 17 Apr 2018 23:30:26 +0000 (16:30 -0700)]
Merge "Update icon for security settings." into pi-dev am: 3e3b496738
am: 59c8620745

Change-Id: I44c9c526b1e77107bd69ace16ecd9779ab25b73f

6 years agoFix text alignment in SIM lock dialog.
Doris Ling [Tue, 17 Apr 2018 23:24:19 +0000 (16:24 -0700)]
Fix text alignment in SIM lock dialog.

- set the text alignment to view start when we bind the view.

Change-Id: Ia7f32d7a422a8a18d092d1ff808f792ab1980e87
Fixes: 78165098
Test: visual

6 years agoMerge "Replace deprecated APIs in audio switcher." into pi-dev
ryanywlin [Tue, 17 Apr 2018 23:18:49 +0000 (16:18 -0700)]
Merge "Replace deprecated APIs in audio switcher." into pi-dev
am: a46dd4bd4b

Change-Id: If17e7d14fbb18ee8849ce7fcb3f270df422a2f72

6 years agoMerge "Replace deprecated APIs in audio switcher." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 23:10:44 +0000 (23:10 +0000)]
Merge "Replace deprecated APIs in audio switcher." into pi-dev

6 years agoMerge "Update preference to set password field" into pi-dev
Salvador Martinez [Tue, 17 Apr 2018 23:08:21 +0000 (16:08 -0700)]
Merge "Update preference to set password field" into pi-dev
am: 13c45045de

Change-Id: I7c8f10af2c5b8514865eb83a49bede123f3403a3

6 years agoMerge "Fix text alignment with rtl languages in entity header." into pi-dev
Fan Zhang [Tue, 17 Apr 2018 23:04:15 +0000 (16:04 -0700)]
Merge "Fix text alignment with rtl languages in entity header." into pi-dev
am: 7298297007

Change-Id: Ifa6e23aa7a5ea12309793b82c2c1a0056b45601f

6 years agoMerge "Update icon for security settings." into pi-dev
Doris Ling [Tue, 17 Apr 2018 23:03:05 +0000 (16:03 -0700)]
Merge "Update icon for security settings." into pi-dev
am: 3e3b496738

Change-Id: I8c2be3da00c85ac0e1a901d66ed3dfb42e82202a

6 years agoMerge "Update preference to set password field" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 22:58:54 +0000 (22:58 +0000)]
Merge "Update preference to set password field" into pi-dev

6 years agoClean Sms raw table when resetting network.
Malcolm Chen [Mon, 16 Apr 2018 21:12:41 +0000 (14:12 -0700)]
Clean Sms raw table when resetting network.

There has been issues when Sms raw table somehow stores orphan
fragments. They lead to garbled message when new fragments come
in and combied with those stale ones. While we work on proper
fixes, one of the options we offer to the user if it happens again,
is to reset all network settings which will clean up this table.

Bug: 77910620
Test: manual test
Change-Id: Ib80c395fb9a1501f35716fdca43df3e5c87893c7

6 years agoMerge "Fix text alignment with rtl languages in entity header." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 22:51:07 +0000 (22:51 +0000)]
Merge "Fix text alignment with rtl languages in entity header." into pi-dev

6 years agoMerge "Remove wrong usage of DoNotTranslate"
Pengquan Meng [Tue, 17 Apr 2018 22:35:24 +0000 (22:35 +0000)]
Merge "Remove wrong usage of DoNotTranslate"

6 years agoMerge "Update icon for security settings." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 22:33:26 +0000 (22:33 +0000)]
Merge "Update icon for security settings." into pi-dev

6 years agoDisable autofill on choose password layout am: 014ed74845
Fan Zhang [Tue, 17 Apr 2018 22:28:06 +0000 (15:28 -0700)]
Disable autofill on choose password layout am: 014ed74845
am: 99b7fd2d54

Change-Id: Ib87e87aa75c4c7b9bc1ae74424152ad7fd986683

6 years agoDisable autofill on choose password layout
Fan Zhang [Tue, 17 Apr 2018 22:13:40 +0000 (15:13 -0700)]
Disable autofill on choose password layout
am: 014ed74845

Change-Id: Ibb71a14a55ef0acc304ef3730d6e89bd2f5492e7

6 years agoReplace deprecated APIs in audio switcher.
ryanywlin [Tue, 17 Apr 2018 08:48:30 +0000 (16:48 +0800)]
Replace deprecated APIs in audio switcher.

- Remove isWiredHeadsetOn() and isBluetoothA2dpOn()
in MediaOutputPreferenceController.

- Remove isWiredHeadsetOn() and isBluetoothScoOn()
in HandsFreeProfileOutputPreferenceController.

- Replace with AudioManager.getDevicesForStream().

- Update test cases.

Bug: 78141441
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j40
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j40
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j40
Change-Id: Ic57c40badf0fd5633f1b7412d63a0b5417d0f47a