OSDN Git Service

android-x86/packages-apps-Settings.git
6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 21 Apr 2018 05:13:51 +0000 (22:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 77e716e463  -s ours

Change-Id: I9696a4c10e97d66c36a4eaca2c1947cb528ecb01

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 05:09:44 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Catch exception when failing to create slice" into pi-dev
Fan Zhang [Sat, 21 Apr 2018 02:24:45 +0000 (19:24 -0700)]
Merge "Catch exception when failing to create slice" into pi-dev
am: 524babb389

Change-Id: Iecb03d8889bb0a1b6f6f43f3b28070bfcc429dff

6 years agoMerge "Catch exception when failing to create slice" into pi-dev
TreeHugger Robot [Sat, 21 Apr 2018 02:03:49 +0000 (02:03 +0000)]
Merge "Catch exception when failing to create slice" into pi-dev

6 years agoMerge "Add keywords to Slices" into pi-dev
Matthew Fritze [Sat, 21 Apr 2018 00:44:13 +0000 (17:44 -0700)]
Merge "Add keywords to Slices" into pi-dev
am: 2f911e2e9e

Change-Id: I55871dd10278feab58ec1ff6faf3f3bd672d9e68

6 years agoMerge "Update settings main page battery string" into pi-dev
Salvador Martinez [Sat, 21 Apr 2018 00:16:46 +0000 (17:16 -0700)]
Merge "Update settings main page battery string" into pi-dev
am: 681353f725

Change-Id: I5a56820ac50ebc322f1352767cfc6fdfe773b292

6 years agoCatch exception when failing to create slice
Fan Zhang [Fri, 20 Apr 2018 19:53:25 +0000 (12:53 -0700)]
Catch exception when failing to create slice

- Created a non-generic exception type when failing SliceData.build()
- Catch exception and log error instead of crash.
- Added a presubmit test

Fixes: 78347031
Test: robotests, atest
Change-Id: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26
Merged-In: I06e528cb5e1cd328f82f9561553f3c4b5b0bed26

6 years agoMerge "Add keywords to Slices" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 23:30:18 +0000 (23:30 +0000)]
Merge "Add keywords to Slices" into pi-dev

6 years agoMerge "Update settings main page battery string" into pi-dev
Salvador Martinez [Fri, 20 Apr 2018 23:27:25 +0000 (23:27 +0000)]
Merge "Update settings main page battery string" into pi-dev

6 years agoAdd keywords to Slices
Matthew Fritze [Thu, 19 Apr 2018 21:50:55 +0000 (14:50 -0700)]
Add keywords to Slices

Attach the keywords used for Settings search to Slices.
Their primary use is helping match synonyms for presenters
which display slices without explicit Uri requests, like a launcher.

This changes:
- Updates database scheme
- Adds to SliceData object
- Grab keywords in the SliceDataConverter
- Set keywords on all slices

Test: robotests
Change-Id: I16c40d2380ffddaf0a87fb1b9cd58e95573b308f
Fixes: 78306195

6 years agoCollapse notification advanced settings
Julia Reynolds [Fri, 20 Apr 2018 19:27:20 +0000 (12:27 -0700)]
Collapse notification advanced settings
am: 5766d6e443

Change-Id: I99aca23639a2e9b1562942f4c37aad0aa7088c52

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Apr 2018 17:37:50 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I93f8c6f0051cf15e218d1c761c300c7e16109165

6 years agoCollapse notification advanced settings
Julia Reynolds [Thu, 19 Apr 2018 17:15:29 +0000 (13:15 -0400)]
Collapse notification advanced settings

Leave footers visible outside of advanced

Test: visual inspection
Fixes: 77324998
Fixes: 38011858
Change-Id: I2d6fcb832b134bc97081f03a3ab38d593e943f76

6 years agoMerge "Fix crash on rotation" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 13:42:59 +0000 (06:42 -0700)]
Merge "Fix crash on rotation" into pi-dev
am: 3bdd65e255

Change-Id: I5dda589d25d114bf3355886c29e6d1325a5250ad

6 years agoMerge "Fix crash on rotation" into pi-dev
Julia Reynolds [Fri, 20 Apr 2018 13:30:28 +0000 (13:30 +0000)]
Merge "Fix crash on rotation" into pi-dev

6 years agoMerge "Update Slice APIs to current versions" into pi-dev
Matthew Fritze [Fri, 20 Apr 2018 03:17:24 +0000 (20:17 -0700)]
Merge "Update Slice APIs to current versions" into pi-dev
am: ff2653a0d8

Change-Id: Id757ea69e9dd2f29ad2f651f0473eeb03d2cca9d

6 years agoMerge "Make WifiTether listen to datasaver" into pi-dev
Salvador Martinez [Fri, 20 Apr 2018 03:11:30 +0000 (20:11 -0700)]
Merge "Make WifiTether listen to datasaver" into pi-dev
am: 96d4cd3c61

Change-Id: Ieb021594b18d10098c5fe50ef6b840c8b8a43e6b

6 years agoMerge "Update Slice APIs to current versions" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 03:11:14 +0000 (03:11 +0000)]
Merge "Update Slice APIs to current versions" into pi-dev

6 years agoMerge "Make WifiTether listen to datasaver" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 02:57:04 +0000 (02:57 +0000)]
Merge "Make WifiTether listen to datasaver" into pi-dev

6 years agoMake WifiTether listen to datasaver
Salvador Martinez [Wed, 18 Apr 2018 00:32:16 +0000 (17:32 -0700)]
Make WifiTether listen to datasaver

Wifi Tethering is already turned off when appropriate. However
if you re-enable it you still can't toggle the tether switchbar.
This CL makes it so that if you disable data saver the toggle
becomes enabled again.

Test: robotests
Bug: 77860936
Change-Id: I03fa74c21674678a90cde7bd20fa68167f02ae3c

6 years agoMerge "Fix Network details title not being translated." into pi-dev
Doris Ling [Fri, 20 Apr 2018 01:10:17 +0000 (18:10 -0700)]
Merge "Fix Network details title not being translated." into pi-dev
am: be22830fde

Change-Id: Ie2d2e0637b1357b926e22bd82372d573a6c6d06b

6 years agoMerge "Fix limit data usage dialog body not being translated." into pi-dev
Doris Ling [Fri, 20 Apr 2018 01:08:59 +0000 (18:08 -0700)]
Merge "Fix limit data usage dialog body not being translated." into pi-dev
am: 21a34488ba

Change-Id: Ie9920bf102323c716ad99ce5d2157231bab1ca7c

6 years agoMerge "Adjust comment on data over usage string." into pi-dev
Sundeep Ghuman [Fri, 20 Apr 2018 01:06:51 +0000 (18:06 -0700)]
Merge "Adjust comment on data over usage string." into pi-dev
am: 35d1d43bb3

Change-Id: I702e97cd957cede9f318757dd8f312ff273777c3

6 years agoMerge "Fix App data usage title not being translated." into pi-dev
Doris Ling [Fri, 20 Apr 2018 00:55:51 +0000 (17:55 -0700)]
Merge "Fix App data usage title not being translated." into pi-dev
am: 3fff843e57

Change-Id: Idf6dc991d79de90d779cc0a084a210f53e7a99b8

6 years agoMerge "Fix Network details title not being translated." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:50:34 +0000 (00:50 +0000)]
Merge "Fix Network details title not being translated." into pi-dev

6 years agoMerge "Update Wifi Tether band selection UI" into pi-dev
Salvador Martinez [Fri, 20 Apr 2018 00:46:31 +0000 (17:46 -0700)]
Merge "Update Wifi Tether band selection UI" into pi-dev
am: d9abb0e914

Change-Id: Ib69cf5155195408170f6eaebd271a32c774e2bbd

6 years agoMerge "Fix limit data usage dialog body not being translated." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:43:58 +0000 (00:43 +0000)]
Merge "Fix limit data usage dialog body not being translated." into pi-dev

6 years agoMerge "Adjust comment on data over usage string." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:36:43 +0000 (00:36 +0000)]
Merge "Adjust comment on data over usage string." into pi-dev

6 years agoMerge "Format number to local locale." into pi-dev
Fan Zhang [Fri, 20 Apr 2018 00:29:26 +0000 (17:29 -0700)]
Merge "Format number to local locale." into pi-dev
am: 0468f68c02

Change-Id: I946d9b8b18762a8047dafbbe938cd47a2c29c4f2

6 years agoUpdate Slice APIs to current versions
Matthew Fritze [Thu, 12 Apr 2018 23:53:41 +0000 (16:53 -0700)]
Update Slice APIs to current versions

Change-Id: Icf40673e518534487be77f33427df937717735e5
Fixes: 77982356
Test: robotests

6 years agoMerge "Fix App data usage title not being translated." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:18:27 +0000 (00:18 +0000)]
Merge "Fix App data usage title not being translated." into pi-dev

6 years agoMerge "Update Wifi Tether band selection UI" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:15:45 +0000 (00:15 +0000)]
Merge "Update Wifi Tether band selection UI" into pi-dev

6 years agoMerge "Format number to local locale." into pi-dev
Fan Zhang [Fri, 20 Apr 2018 00:01:01 +0000 (00:01 +0000)]
Merge "Format number to local locale." into pi-dev

6 years agoFix Network details title not being translated.
Doris Ling [Thu, 19 Apr 2018 23:49:35 +0000 (16:49 -0700)]
Fix Network details title not being translated.

- use the title resource id instead of the actual string in the launch
intent so that it can react to language change.

Change-Id: I424dc026a9298d12627c05f97f27e9d4cba5a341
Fixes: 77896130
Test: run i18nscreenshots

6 years agoFix limit data usage dialog body not being translated.
Doris Ling [Thu, 19 Apr 2018 23:35:28 +0000 (16:35 -0700)]
Fix limit data usage dialog body not being translated.

- need to pass the resource id instead of the text when building the
dialog in order for it to react to language change.
- also remove the unnecessary set/get the body message in the dialog
creation since the msg id can be used directly.

Change-Id: I399dcda54961fac457fc5f0fad9082f2c1e1a2b2
Fixes: 77897157
Test: run i18nscreenshots

6 years agoAdjust comment on data over usage string.
Sundeep Ghuman [Wed, 18 Apr 2018 18:50:12 +0000 (11:50 -0700)]
Adjust comment on data over usage string.

Bug: 75981328
Test: NA
Change-Id: I393ab6637d563a34e9cea2da2b9c29e32efb056f

6 years agoFix App data usage title not being translated.
Doris Ling [Thu, 19 Apr 2018 23:03:50 +0000 (16:03 -0700)]
Fix App data usage title not being translated.

- we need to pass the title resource id instead of the actual text in
the launch intent in order for it react to language change properly.

Change-Id: I72ccbe67411c9f4da328dd24671f4e71ab927851
Fixes: 77898325
Test: run i18nscreenshots

6 years agoFormat number to local locale.
Fan Zhang [Thu, 19 Apr 2018 22:54:00 +0000 (15:54 -0700)]
Format number to local locale.

Change-Id: Iffa91eb8c40f09e5ac4cce10f355e348e62d8fce
Fixes: 78134172
Test: robotests

6 years agoUpdate Wifi Tether band selection UI
Salvador Martinez [Fri, 13 Apr 2018 00:21:06 +0000 (17:21 -0700)]
Update Wifi Tether band selection UI

This CL updates the preference for selecting the enabled tether bands
to allow individual selection of multiple bands instead of forcing
a single selection. Note that while this makes the UI theoretically
support new bands in the future, the wifi backend only supports
selecting a single band or all bands which this CL does not address.

Test: robotests
Bug: 73102003
Change-Id: Ib2d4a2834c5cd11875515d308f7b20bfc8471959

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 "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: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
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 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 agoFix crash on rotation
Julia Reynolds [Thu, 19 Apr 2018 14:04:53 +0000 (10:04 -0400)]
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

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
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 agoUpdate settings main page battery string
Salvador Martinez [Wed, 18 Apr 2018 22:56:28 +0000 (15:56 -0700)]
Update settings main page battery string

UX requested that the percentage be moved to the front.

Test: robotests pass
Bug: 77874406
Change-Id: I7008c81fa42487bb71ecd84b6a66203d89fe50a8

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 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 "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: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 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: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
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 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 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
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 "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 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 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 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