OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agomove inputmethod test package to sdk 26
jeffreyhuang [Thu, 30 Nov 2017 20:28:14 +0000 (12:28 -0800)]
move inputmethod test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I4d0435d8833bf1ff767688109e239c6729fdead9

6 years agoMerge "Fix robolectric tests"
TreeHugger Robot [Wed, 29 Nov 2017 22:51:27 +0000 (22:51 +0000)]
Merge "Fix robolectric tests"

6 years agoMerge "Fix indexing in cast and zen mode settings"
TreeHugger Robot [Wed, 29 Nov 2017 22:36:18 +0000 (22:36 +0000)]
Merge "Fix indexing in cast and zen mode settings"

6 years agoMerge "Update asset for no search result image"
TreeHugger Robot [Wed, 29 Nov 2017 21:14:27 +0000 (21:14 +0000)]
Merge "Update asset for no search result image"

6 years agoMerge "Add preference group for saved devcies."
TreeHugger Robot [Wed, 29 Nov 2017 21:14:14 +0000 (21:14 +0000)]
Merge "Add preference group for saved devcies."

6 years agoFix robolectric tests
Fan Zhang [Wed, 29 Nov 2017 20:48:01 +0000 (12:48 -0800)]
Fix robolectric tests

- Override a button style to avoid dependency on new style name.

Change-Id: I62935afe16424d8ddf0c2448327d76eda00440a5
Fixes: 69918100
Test: robotests

6 years agoMerge changes I8122a411,I947d418a,Ib90ad5af,I514918b5
TreeHugger Robot [Wed, 29 Nov 2017 20:42:38 +0000 (20:42 +0000)]
Merge changes I8122a411,I947d418a,Ib90ad5af,I514918b5

* changes:
  Move fuelgauge test package to sdk 26
  Update AnomalySummarPrefCtrl to sdk 26
  Update BackgroundActivityPrefCtrl to sdk 26
  Update BatteryHeaderPreferenceCtrlTest to sdk 26

6 years agoMerge "Rename search bar corner radius dimen to allow oem override"
TreeHugger Robot [Wed, 29 Nov 2017 20:33:19 +0000 (20:33 +0000)]
Merge "Rename search bar corner radius dimen to allow oem override"

6 years agoUpdate asset for no search result image
Fan Zhang [Wed, 29 Nov 2017 18:53:37 +0000 (10:53 -0800)]
Update asset for no search result image

Bug: 68863351
Test: visual
Change-Id: Ia4d411e5d7d1db8b321fdfde006a93c6ff52ecb3

6 years agoMerge "Fix ConcurrentModificationException in SummaryLoader."
TreeHugger Robot [Wed, 29 Nov 2017 19:57:40 +0000 (19:57 +0000)]
Merge "Fix ConcurrentModificationException in SummaryLoader."

6 years agoMove fuelgauge test package to sdk 26
jeffreyhuang [Wed, 29 Nov 2017 18:54:27 +0000 (10:54 -0800)]
Move fuelgauge test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I8122a41132821a42c4ec8c5995a1a11833b686cd

6 years agoUpdate AnomalySummarPrefCtrl to sdk 26
jeffreyhuang [Wed, 29 Nov 2017 18:53:21 +0000 (10:53 -0800)]
Update AnomalySummarPrefCtrl to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I947d418a48cb06b0e88c9d87822dd90d336ec6c2

6 years agoUpdate BackgroundActivityPrefCtrl to sdk 26
jeffreyhuang [Wed, 29 Nov 2017 18:51:13 +0000 (10:51 -0800)]
Update BackgroundActivityPrefCtrl to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ib90ad5afd0539a2ee69f153a49979d443fc3ff68

6 years agoMerge changes Ieefdc9d1,Id2dad12b
Jeffrey Huang [Wed, 29 Nov 2017 18:47:02 +0000 (18:47 +0000)]
Merge changes Ieefdc9d1,Id2dad12b

* changes:
  Move fingerprint package to sdk 26
  Update DeleteFingerprintDialogTest to sdk 26

6 years agoMerge "Update the usage of getDefaultUserIcon"
TreeHugger Robot [Wed, 29 Nov 2017 11:13:11 +0000 (11:13 +0000)]
Merge "Update the usage of getDefaultUserIcon"

6 years agoRename search bar corner radius dimen to allow oem override
Fan Zhang [Wed, 29 Nov 2017 02:02:47 +0000 (18:02 -0800)]
Rename search bar corner radius dimen to allow oem override

Bug: 68814716
Test: visual
Change-Id: Iac4da717aea9fd1c3e9cec089464cbb4dccb75f9

6 years agoFix indexing in cast and zen mode settings
Fan Zhang [Wed, 29 Nov 2017 00:52:53 +0000 (16:52 -0800)]
Fix indexing in cast and zen mode settings

- Fragment should either not implement serach provider or return a valid
  xml. Search provider with 0 resource is invalid.

Change-Id: Ie87c739bf72c926cecf48d271c6c2d72459787c4
Fixes: 69864274
Test: robotests

6 years agoUpdate BatteryHeaderPreferenceCtrlTest to sdk 26
jeffreyhuang [Wed, 29 Nov 2017 01:13:57 +0000 (17:13 -0800)]
Update BatteryHeaderPreferenceCtrlTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I514918b528984881d983bee6248e909e7b7824da

6 years agoMove fingerprint package to sdk 26
jeffreyhuang [Wed, 29 Nov 2017 00:44:44 +0000 (16:44 -0800)]
Move fingerprint package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ieefdc9d10b8c3b68757c6a89990f380599e14e9b

6 years agoUpdate DeleteFingerprintDialogTest to sdk 26
jeffreyhuang [Wed, 29 Nov 2017 00:44:16 +0000 (16:44 -0800)]
Update DeleteFingerprintDialogTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Id2dad12b653caf93c84e043da9be389166b1f421

6 years agoFix ConcurrentModificationException in SummaryLoader.
Doris Ling [Thu, 23 Nov 2017 01:29:21 +0000 (17:29 -0800)]
Fix ConcurrentModificationException in SummaryLoader.

When the dashboard summary is being initialized, it will rebuild the UI
while the summary loader tries to to go through the tiles to update the
summary. Both is being done on a separate backgroud thread, and it will
run into concurrent modification issue if the thread is being swapped
while one is looping through the list.

Instead of letting clients access the list of tiles directly, add a
getter method in DashboardCategory to get a copy of the list of tiles
for all read-only operations.

Change-Id: I479669abd8d1d0a8ee9a4113d8ad2244da56f4d8
Fixes: 69677575
Test: make RunSettingsRoboTests

6 years agoMerge "Remove extra newline in AndroidManifest." am: 8aeb69396d am: 9d30592308
Malcolm Chen [Wed, 29 Nov 2017 00:42:53 +0000 (00:42 +0000)]
Merge "Remove extra newline in AndroidManifest." am: 8aeb69396d am: 9d30592308
am: 68af33f2df

Change-Id: I308b4cd283b522f50d6c124de2f36b6f93457105

6 years agoMerge "Remove extra newline in AndroidManifest." am: 8aeb69396d
Malcolm Chen [Wed, 29 Nov 2017 00:36:54 +0000 (00:36 +0000)]
Merge "Remove extra newline in AndroidManifest." am: 8aeb69396d
am: 9d30592308

Change-Id: I2b4480c0d1a98ce4bb87d6fa30f347b929703fe9

6 years agoMerge changes I6b4c5d1d,I1b81bbdf
TreeHugger Robot [Wed, 29 Nov 2017 00:35:25 +0000 (00:35 +0000)]
Merge changes I6b4c5d1d,I1b81bbdf

* changes:
  Move enterprise test package to sdk 26
  Update ApplicationListPreferenceCtrlTest to sdk 26

6 years agoMerge "Remove extra newline in AndroidManifest."
Malcolm Chen [Wed, 29 Nov 2017 00:31:49 +0000 (00:31 +0000)]
Merge "Remove extra newline in AndroidManifest."
am: 8aeb69396d

Change-Id: I36ea57db56ff985da118fb7ab117bf939b7b2dc1

6 years agoMerge "Remove extra newline in AndroidManifest."
Treehugger Robot [Wed, 29 Nov 2017 00:22:47 +0000 (00:22 +0000)]
Merge "Remove extra newline in AndroidManifest."

6 years agoMerge changes I88978ab8,I07137c92,Ifdd4db51
TreeHugger Robot [Wed, 29 Nov 2017 00:09:31 +0000 (00:09 +0000)]
Merge changes I88978ab8,I07137c92,Ifdd4db51

* changes:
  Move display test package to sdk 26
  Update AppGridViewTest to sdk 26
  Update AmbientDisplayAlwaysOnPrefTest to sdk 26

6 years agoMerge "Move dream test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 23:51:30 +0000 (23:51 +0000)]
Merge "Move dream test package to sdk 26"

6 years agoMerge "Move deviceinfo test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Move deviceinfo test package to sdk 26"

6 years agoMove enterprise test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 22:50:02 +0000 (14:50 -0800)]
Move enterprise test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I6b4c5d1d2ba9e7f48168c545432a5a62d024f43d

6 years agoUpdate ApplicationListPreferenceCtrlTest to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 22:49:19 +0000 (14:49 -0800)]
Update ApplicationListPreferenceCtrlTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I1b81bbdf63e9baf07f2db4eda71243c7cdab834e

6 years agoMerge changes I886a7277,I25d96c82
TreeHugger Robot [Tue, 28 Nov 2017 22:43:30 +0000 (22:43 +0000)]
Merge changes I886a7277,I25d96c82

* changes:
  Move development test package to sdk 26
  Move OemUnlockPreferenceControllerTest to sdk 26

6 years agoMerge "Add SettingsPrefController for Slices"
TreeHugger Robot [Tue, 28 Nov 2017 22:14:28 +0000 (22:14 +0000)]
Merge "Add SettingsPrefController for Slices"

6 years agoMove dream test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 21:48:11 +0000 (13:48 -0800)]
Move dream test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I009e768a9911ecb3cbf6bd056bfe29802a65805b

6 years agoMove display test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 21:41:30 +0000 (13:41 -0800)]
Move display test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I88978ab800e845eda6c937bf890016d53928d4fd

6 years agoUpdate AppGridViewTest to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 21:41:19 +0000 (13:41 -0800)]
Update AppGridViewTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I07137c9274920a163db4ddf676800d70ef76c8bb

6 years agoUpdate AmbientDisplayAlwaysOnPrefTest to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 21:41:02 +0000 (13:41 -0800)]
Update AmbientDisplayAlwaysOnPrefTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ifdd4db51e87fd38defef23946811b5e24e6c7cfe

6 years agoMerge "Update Settings to use DeviceDefault colored button"
TreeHugger Robot [Tue, 28 Nov 2017 21:23:49 +0000 (21:23 +0000)]
Merge "Update Settings to use DeviceDefault colored button"

6 years agoMove deviceinfo test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 21:06:39 +0000 (13:06 -0800)]
Move deviceinfo test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I8546a4503f84b169642f723e87f4a91cf4c99dd0

6 years agoMerge "Move deletionhelper test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 20:21:20 +0000 (20:21 +0000)]
Merge "Move deletionhelper test package to sdk 26"

6 years agoMove development test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 19:57:13 +0000 (11:57 -0800)]
Move development test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I886a72774442884329d15e5dd276b00a269201c5

6 years agoMove OemUnlockPreferenceControllerTest to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 19:56:57 +0000 (11:56 -0800)]
Move OemUnlockPreferenceControllerTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I25d96c82bd99c5c7adba6b6269f1a5735b22ca5b

6 years agoMerge "Implement querySiteMapPairs for indexableProvider."
TreeHugger Robot [Tue, 28 Nov 2017 19:38:32 +0000 (19:38 +0000)]
Merge "Implement querySiteMapPairs for indexableProvider."

6 years agoMerge changes Icae52730,I38282b97
TreeHugger Robot [Tue, 28 Nov 2017 19:32:46 +0000 (19:32 +0000)]
Merge changes Icae52730,I38282b97

* changes:
  Move dashboard test package to sdk 26
  Update DashboardFeatureProviderImplTest to sdk 26

6 years agoMerge "move connecteddevice test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 18:58:29 +0000 (18:58 +0000)]
Merge "move connecteddevice test package to sdk 26"

6 years agoMerge "Add new method to FakeUid"
TreeHugger Robot [Tue, 28 Nov 2017 18:43:49 +0000 (18:43 +0000)]
Merge "Add new method to FakeUid"

6 years agoMove deletionhelper test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 18:15:15 +0000 (10:15 -0800)]
Move deletionhelper test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ib791b499c1c6231f3d17bf3dfbfd65c2bdaf0f77

6 years agoMerge "Move datetime package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 04:05:46 +0000 (04:05 +0000)]
Merge "Move datetime package to sdk 26"

6 years agoMerge "Move datausage test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 02:39:31 +0000 (02:39 +0000)]
Merge "Move datausage test package to sdk 26"

6 years agoMerge "Move datausage test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 02:38:24 +0000 (02:38 +0000)]
Merge "Move datausage test package to sdk 26"

6 years agoMerge "Move bluetooth test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 01:26:41 +0000 (01:26 +0000)]
Merge "Move bluetooth test package to sdk 26"

6 years agoMerge "Move backup package tests to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 01:12:35 +0000 (01:12 +0000)]
Merge "Move backup package tests to sdk 26"

6 years agoMove datausage test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 01:09:51 +0000 (17:09 -0800)]
Move datausage test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ie09794d6d32794ac40c3e6587b81fc108b445c9c

6 years agoMove datetime package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 01:05:06 +0000 (17:05 -0800)]
Move datetime package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I0b93682625e15a6306f5fbd3409d4a4003beb805

6 years agoMove dashboard test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 00:37:08 +0000 (16:37 -0800)]
Move dashboard test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Icae52730bb12abcabb42d7e0a905c2b9108c3e28

6 years agoUpdate DashboardFeatureProviderImplTest to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 00:36:36 +0000 (16:36 -0800)]
Update DashboardFeatureProviderImplTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I38282b97b3e0325a1568d1af9bd2b38b110736c1

6 years agoMove datausage test package to sdk 26
jeffreyhuang [Tue, 28 Nov 2017 00:46:52 +0000 (16:46 -0800)]
Move datausage test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I10d2d0eb9abafe8a81adab3ce3f5db2f1f3337b8

6 years agoAdd SettingsPrefController for Slices
Matthew Fritze [Wed, 15 Nov 2017 23:12:52 +0000 (15:12 -0800)]
Add SettingsPrefController for Slices

Adds a new abstraction layer between preference controllers
and the AbstractPreferenceController. The layer is used to
consolidate the logic for each the setting type for getting
and setting values. This will be extended to support UI
information for Slices.

For reference how this fits into Slices, look at the
like-named classes added in this prototype:
ag/3221891

The changes in Search are as a transition into deprecation.
The code for Search in Settings is out-of-date from the
unbundled counterpart, and this change is made so that the
current code behaves as normal.

Test: robotests
Bug: 67996707
Change-Id: Ib1faab706485039edad66119a27a3fd5cabe6009

6 years agoMerge changes I9815f48e,Ib344f062,I84b62392,I81bfdff0
TreeHugger Robot [Tue, 28 Nov 2017 00:32:37 +0000 (00:32 +0000)]
Merge changes I9815f48e,Ib344f062,I84b62392,I81bfdff0

* changes:
  Move applications test package to sdk 26
  Update tests to sdk 26
  move manageapplications to sdk 26
  Update viewholder tests to sdk 26

6 years agoMerge "Update RecentAppsPreferenceControllerTest to sdk26"
TreeHugger Robot [Tue, 28 Nov 2017 00:02:53 +0000 (00:02 +0000)]
Merge "Update RecentAppsPreferenceControllerTest to sdk26"

6 years agoImplement querySiteMapPairs for indexableProvider.
Fan Zhang [Mon, 27 Nov 2017 23:50:19 +0000 (15:50 -0800)]
Implement querySiteMapPairs for indexableProvider.

Query sitemap will return a list of pairs [parent class name, child
class name]. It's up to consumer to figure out the display name later
so the provider doesn't have dependency on localizing any display names.

- Removed SiteMapManagerTest. We will perform the test in
  SettingsIntelligence instead.
- Added test for the new provider in instrumentation test (robolectric
  doesn't recognize the new constants in framework yet)

Bug: 67359411
Bug: 64938328
Test: atest
Change-Id: Ia973115320e6b7c8cf84d4756db1763ae7010aed

6 years agomove connecteddevice test package to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 23:47:24 +0000 (15:47 -0800)]
move connecteddevice test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I8dd681215dcc1f3da44c5ab852c2d80016aeeb5c

6 years agoMove bluetooth test package to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 23:42:25 +0000 (15:42 -0800)]
Move bluetooth test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I26e6f437052caafd97f3f164b388d379fc890e7e

6 years agoMove backup package tests to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 23:14:12 +0000 (15:14 -0800)]
Move backup package tests to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I016e8ae3336544c4c75ead96d06e4b461ed13773

6 years agoMerge "Update style names due to theme migration"
TreeHugger Robot [Mon, 27 Nov 2017 23:14:02 +0000 (23:14 +0000)]
Merge "Update style names due to theme migration"

6 years agoMove applications test package to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 22:55:38 +0000 (14:55 -0800)]
Move applications test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I9815f48ed9c6ddcfdae10cf09fbdf742a7066dfa

6 years agoUpdate tests to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 22:55:02 +0000 (14:55 -0800)]
Update tests to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ib344f0622dfa3b9f9a8fdd6736bc34cb4f536db8

6 years agoMerge changes I8668be19,Ifb7769a1
Jeffrey Huang [Mon, 27 Nov 2017 21:47:12 +0000 (21:47 +0000)]
Merge changes I8668be19,Ifb7769a1

* changes:
  move defaultapps package to sdk 26
  Update DefaultAppInfoTest to sdk 26

6 years agomove manageapplications to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 20:05:11 +0000 (12:05 -0800)]
move manageapplications to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I84b62392a4a4d55c1d4e6a9eadc5910e4b9a8530

6 years agoUpdate viewholder tests to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 20:04:43 +0000 (12:04 -0800)]
Update viewholder tests to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I81bfdff059255b3e7a20270dea62ffd56cc53ad5

6 years agoMerge "Make sure FP error text is visible in landscape"
TreeHugger Robot [Mon, 27 Nov 2017 21:42:38 +0000 (21:42 +0000)]
Merge "Make sure FP error text is visible in landscape"

6 years agoUpdate RecentAppsPreferenceControllerTest to sdk26
jeffreyhuang [Mon, 27 Nov 2017 21:37:31 +0000 (13:37 -0800)]
Update RecentAppsPreferenceControllerTest to sdk26

 - Remove the usage of the mock context to avoid null pointers in sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I73dac0c91e56d84cdec0314a4ec5754a0a98c54b

6 years agoMerge "CredentialStorage: Fix manual key installation."
TreeHugger Robot [Mon, 27 Nov 2017 21:10:25 +0000 (21:10 +0000)]
Merge "CredentialStorage: Fix manual key installation."

6 years agoAdd new method to FakeUid
Ahmed ElArabawy [Tue, 31 Oct 2017 01:07:35 +0000 (18:07 -0700)]
Add new method to FakeUid

This commit adds a new method to FakeUid
The added method is getMulticastWakelockStats()

Test: Manual Test
Bug: 33649966
Change-Id: I55c31eca87f1ad46e478d5e9e5e2f951eaee0265
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
6 years agoAdd preference group for saved devcies.
jackqdyulei [Tue, 21 Nov 2017 18:44:21 +0000 (10:44 -0800)]
Add preference group for saved devcies.

Currently it only contains bluetooth devices.

Bug: 3240835
Test: RunSettingsRoboTests
Change-Id: Ief102e7174a4c4610dbda6b728419b303ff928f9

6 years agoMerge "Increase max char limit for sim slot number"
TreeHugger Robot [Mon, 27 Nov 2017 20:06:41 +0000 (20:06 +0000)]
Merge "Increase max char limit for sim slot number"

6 years agoMerge "Move assist package to sdk 26"
TreeHugger Robot [Mon, 27 Nov 2017 19:50:34 +0000 (19:50 +0000)]
Merge "Move assist package to sdk 26"

6 years agoMerge "rename v2 controllers"
TreeHugger Robot [Mon, 27 Nov 2017 19:48:36 +0000 (19:48 +0000)]
Merge "rename v2 controllers"

6 years agoMerge "Fix comma typo"
TreeHugger Robot [Mon, 27 Nov 2017 19:43:19 +0000 (19:43 +0000)]
Merge "Fix comma typo"

6 years agoMerge "Update string for battery saver"
TreeHugger Robot [Mon, 27 Nov 2017 19:25:00 +0000 (19:25 +0000)]
Merge "Update string for battery saver"

6 years agomove defaultapps package to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 19:19:00 +0000 (11:19 -0800)]
move defaultapps package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I8668be1963135af3088229c440ac2aff88b77899

6 years agoUpdate DefaultAppInfoTest to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 19:18:19 +0000 (11:18 -0800)]
Update DefaultAppInfoTest to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Ifb7769a1bf0b22581dac80d7343e6cb58515af26

6 years agoMove assist package to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 18:21:47 +0000 (10:21 -0800)]
Move assist package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: Id37a5b2e445481bc586f12a4397e7082f28ec075

6 years agoFix comma typo
jeffreyhuang [Mon, 27 Nov 2017 18:12:06 +0000 (10:12 -0800)]
Fix comma typo

Bug: 69672170
Test: Manual
Change-Id: Ib32695ca8ecf19e3d0c4174ce7fbd9f2af31c29a

6 years agoUpdate style names due to theme migration
Antony Sargent [Fri, 27 Oct 2017 20:22:36 +0000 (13:22 -0700)]
Update style names due to theme migration

This updates some theme names to go along with a change to migrate some
theme elements from SettingsLib to the support library.

Bug: 64689839
Test: manual
Change-Id: I31b96c321def78bbb49239faae6ba8e73aacd2fa

6 years agoIncrease max char limit for sim slot number
jeffreyhuang [Mon, 27 Nov 2017 18:06:37 +0000 (10:06 -0800)]
Increase max char limit for sim slot number

 - translations to other languages requires a few more characters

Bug: 69672094
Test: Compiles
Change-Id: I59c1ced9098b02718599a1feb7e64903e8dbd7f7

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 419407eaea -s ours
Bill Yi [Sun, 26 Nov 2017 23:08:53 +0000 (23:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 419407eaea  -s ours
am: 1ef2ec2264  -s ours

Change-Id: Ib4a2d4cc1eb42015dfdf56fba3417918de2af670

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 26 Nov 2017 23:05:52 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 419407eaea  -s ours

Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 26 Nov 2017 23:02:14 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE am: 9ae05458f0 -s ours am: b2cc06ea43 -s ours
Bill Yi [Sun, 26 Nov 2017 22:55:21 +0000 (22:55 +0000)]
Import translations. DO NOT MERGE am: 9ae05458f0  -s ours am: b2cc06ea43  -s ours
am: 97e5272958  -s ours

Change-Id: I6b5222e2b795f7c08279ca142eada5087cb2803a

6 years agoImport translations. DO NOT MERGE am: 9ae05458f0 -s ours
Bill Yi [Sun, 26 Nov 2017 22:52:50 +0000 (22:52 +0000)]
Import translations. DO NOT MERGE am: 9ae05458f0  -s ours
am: b2cc06ea43  -s ours

Change-Id: I6e6335049140a4cb73bb694dd4636f264e1876a4

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 26 Nov 2017 22:49:49 +0000 (22:49 +0000)]
Import translations. DO NOT MERGE
am: 9ae05458f0  -s ours

Change-Id: I829586defb2cf0da3395bc8eb41ae243faf02173

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 26 Nov 2017 20:19:05 +0000 (12:19 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 26 Nov 2017 20:15:58 +0000 (12:15 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ibfb674f157b342ea77c07cd88c47dc25b2fcd03e

6 years agoCredentialStorage: Fix manual key installation.
Eran Messeri [Wed, 22 Nov 2017 17:29:38 +0000 (17:29 +0000)]
CredentialStorage: Fix manual key installation.

Since the introduction of user-selectability of keys into KeyChain,
keys installed in KeyChain, by default, cannot be granted access
by the user. This is a secure default, and means keys manually
installed by the user should be explicitly marked as user-selectable.

This change marks the user-added alias as user-selectable, so it can be
selected, later on, by the user, from the Certificate Selection prompt.

Bug: 65624467
Test: Manually with CtsVerifier (KeyChainTest).
Change-Id: I618a06270a127a38b2aa3098fddfa518515bc1b1

6 years agoUpdate the usage of getDefaultUserIcon
Tony Mak [Thu, 23 Nov 2017 08:58:20 +0000 (16:58 +0800)]
Update the usage of getDefaultUserIcon

getDefaultUserIcon now takes resources as parameter for the sake of
resource overlaying.

BUG=69355037
Test: Factory reset and go to settings -> User, observe the new color.

Change-Id: I504acf00c4616c342d2b8e99b061e4043b34c378

6 years agoMerge "Disable DevelopmentSettingsActivity by default"
TreeHugger Robot [Thu, 23 Nov 2017 01:47:53 +0000 (01:47 +0000)]
Merge "Disable DevelopmentSettingsActivity by default"

6 years agoMerge "Update search bar visual"
TreeHugger Robot [Thu, 23 Nov 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Update search bar visual"

6 years agoMerge "Move accounts package tests to sdk 26"
Jeffrey Huang [Thu, 23 Nov 2017 00:53:02 +0000 (00:53 +0000)]
Merge "Move accounts package tests to sdk 26"

6 years agoMerge "Update AccountDetailDashboardFragmentTest"
Jeffrey Huang [Thu, 23 Nov 2017 00:52:50 +0000 (00:52 +0000)]
Merge "Update AccountDetailDashboardFragmentTest"