Commit Graph

49467 Commits

Author SHA1 Message Date
Fan Zhang
966d842be0 Revert "Disable failing test to unblock presubmit"
This reverts commit 69cc84d22c.

Bug: 122824614
Test: robotests
Reason for revert: b/122824614

Change-Id: I5730b6c0a5e6d26fd54a8a1eff8d1eab3144a8ee
2019-01-14 19:56:24 +00:00
Fan Zhang
bb28fb4660 Merge changes I90fa8649,Idd9725dd
* changes:
  Disable failing test to unblock presubmit
  Add live caption preference in accessibility page.
2019-01-14 19:53:26 +00:00
Fan Zhang
69cc84d22c Disable failing test to unblock presubmit
Bug: 122824614
Test: rerun robotest
Change-Id: I90fa864906675c6d072d25b27b6a61f59933d324
2019-01-14 11:50:24 -08:00
Julia Reynolds
e88f7ab7a7 Update appearance of channel preferences
Test: atest
Change-Id: Ie58e7a27601ee23b1cd2caf990cc5c10006c0162
Fixes: 122671854
2019-01-14 13:04:22 -05:00
Beverly
bd81bb0e34 Increase char count on Charging sounds string
Test: manual
Change-Id: I5c4bedd6cf4f8ed85ae7df8ab78baf0ae3937dd5
Fixes: 122743016
2019-01-14 13:01:00 -05:00
Anton Hansson
de324b9b70 [automerger skipped] Merge "Make the Settings permission a required module" am: 480b56e3d6 am: bc79e6e6f3
am: 850fdb32e9 -s ours
am skip reason: change_id Ia2548355282498bceeffddb564de32a6cb857c66 with SHA1 16322a0271 is in history

Change-Id: Iab476273c6b332525177fe76f5f8d779ffe0f0c7
2019-01-14 08:23:41 -08:00
Anton Hansson
850fdb32e9 Merge "Make the Settings permission a required module" am: 480b56e3d6
am: bc79e6e6f3

Change-Id: I775d8b3a84ef2c1eccfb8d590e97ee1dcbeedf5d
2019-01-14 08:15:32 -08:00
Anton Hansson
bc79e6e6f3 Merge "Make the Settings permission a required module"
am: 480b56e3d6

Change-Id: I2316d82bb50778e6f524d708cc1711dcd69f1f9d
2019-01-14 08:11:21 -08:00
Anton Hansson
480b56e3d6 Merge "Make the Settings permission a required module" 2019-01-14 16:03:16 +00:00
Anton Hansson
09064cf6d9 Make the Settings permission a required module
This will include the Settings permission file whenever
the Settings app is installed.

Bug: 110072687
Test: make
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
Merged-In: Ia2548355282498bceeffddb564de32a6cb857c66
(cherry picked from commit 16322a0271)
2019-01-14 15:50:28 +00:00
Anton Hansson
a4449f4ad5 [automerger skipped] Merge "Move Settings app to /product" am: 0a399bf543 am: 297fe94122
am: 403fe5d83c -s ours
am skip reason: change_id Iee5940125af3f2a8543ecb3a68d7fba737acd77d with SHA1 f109282c8e is in history

Change-Id: I0c6d59fd5d2aa9233fc801e3ab002e3d8ecc5e65
2019-01-14 02:07:52 -08:00
Anton Hansson
403fe5d83c Merge "Move Settings app to /product" am: 0a399bf543
am: 297fe94122

Change-Id: I6f04ca71a2a4af1cfb4bc07019f991bc845fd8e6
2019-01-14 01:50:56 -08:00
Anton Hansson
297fe94122 Merge "Move Settings app to /product"
am: 0a399bf543

Change-Id: Ia4a28ee04e834727d7cfa86e67f1038f16aeee1d
2019-01-14 01:22:53 -08:00
Anton Hansson
0a399bf543 Merge "Move Settings app to /product" 2019-01-14 09:06:25 +00:00
Yi-Ling Chuang
84acc5666d Update the layout of contextual card dismissal view
- Swap the two buttons.
- Alter margins.

Bug: 113783548
Test: visual
Change-Id: I1d491d0bccb206331789e031310f0adfd34671fd
2019-01-14 16:42:01 +08:00
Bill Yi
e5262dbca1 [automerger skipped] Import translations. DO NOT MERGE am: e18f734843 -s ours
am: 004425d2b9 -s ours
am skip reason: subject contains skip directive

Change-Id: I2d653a77b670af9953654a488c0078a597d32e39
2019-01-13 16:47:57 -08:00
Bill Yi
004425d2b9 [automerger skipped] Import translations. DO NOT MERGE
am: e18f734843 -s ours
am skip reason: subject contains skip directive

Change-Id: I7eeb038b93fe47601b946e74d0309e6923e048d5
2019-01-13 16:39:54 -08:00
TreeHugger Robot
eb372989fd Merge "[WPA3] Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers" 2019-01-13 16:15:05 +00:00
Kiyoung Kim
1a3425ed2a Schematize Display system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I83b40ddfcde32d8d03fae73f5c252013933c466c
2019-01-13 17:10:24 +09:00
Kiyoung Kim
95ca4bf581 Merge "Schematize ADB system properties" 2019-01-13 08:05:42 +00:00
Bill Yi
e18f734843 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
2019-01-12 23:00:35 -08:00
TreeHugger Robot
cb789fffd5 Merge "Fix NPE" 2019-01-12 04:37:22 +00:00
Kevin Chyn
f6aa140c36 Merge "Remove extra button from fingerprint enroll layout" 2019-01-12 01:50:04 +00:00
jackqdyulei
56726ca04c Remove divider line for battery card preference
Use CardPreference directly here instead of preference category
Also clean up code and test a little bit.

Bug: 119618813
Test: RunSettingsRoboTests
Change-Id: I3ee2313c10e6e2e34609137f3dcb0391104377d5
2019-01-11 15:55:33 -08:00
hjchangliao
c37973f073 Move edit icon from header to action bar
Move edit icon in bluetooth detail page,
from header back to action bar.

Change-Id: I6afd7c611fe4db8c6c27921b5da316d8a1a000db
Fixes: 76206922
Test: make RunSettingsRoboTests
2019-01-12 07:36:32 +08:00
Ruchi Kandoi
aea07dc98a Add metric for Tap & Pay Foreground Setting
Bug: 111458041
Test: atest NfcForegroundPreferenceControllerTest
Change-Id: I090c223b65858535cc70e61820dc5d077de99a40
2019-01-11 15:21:16 -08:00
Fan Zhang
d64901494f Add live caption preference in accessibility page.
Change-Id: Idd9725ddbbcf658325b1f04b07a0ed9cfa6c2682
Fixes: 121373754
Test: robotests
2019-01-11 15:15:12 -08:00
Kevin Chyn
43626165e3 Remove extra button from fingerprint enroll layout
The button doesn't even respond due to other code changes.
Buttons are now created in java using SUW library

Change-Id: I96943c973e23a06fe5f07c074f2c35f4bcc05dd3
Fixes: 122371369
Test: Only footer button shows
2019-01-11 14:03:46 -08:00
Naina Nalluri
d1b57f62d8 Add switch to enable/disable cbrs
Add switch to enable or disable cbrs
based on whether it is supported or not

Bug: 121291721
Test: Tested enable/disable of the setting on device

Change-Id: Ia79b177966412b2128a6d9cab3549d704253d7b5
2019-01-11 19:29:49 +00:00
jackqdyulei
6da5e32bd8 Add CardPreference in battery settings page
This is MatrialCardView styled preference that only support
icon, title and summary.

Bug: 119618813
Test: RunSettingsRoboTests
Change-Id: Ibbf9eb2a01c8ee0579e1553ead6e43e96531c92a
2019-01-11 11:00:03 -08:00
jackqdyulei
35209f6e6c Update height of SliceView
So it can display 6 items at most, not 4 items

Bug: 120803703
Test: Manual
Change-Id: Id34398903d0f81bebee3e02c024d21ad2e68578f
2019-01-11 10:55:59 -08:00
Svetoslav Ganov
8b9529e533 Merge "Update tests due to new platform API intruducing ambibuity" 2019-01-11 18:48:55 +00:00
Lei Yu
aa8de12e8d Merge "Add UiBlocker for DashboardFragment" 2019-01-11 18:17:56 +00:00
Anton Hansson
9a7786b3e1 Move Settings app to /product
Since this app is frequently customized by OEMs, it doesn't
fit in the mainline /system image right now. Move it to
/product.

Bug: 110072687
Test: make
Change-Id: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
Merged-In: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
(cherry picked from commit f109282c8e)
2019-01-11 16:41:54 +00:00
Julia Reynolds
08ebca3804 Fix NPE
Test: manual
Change-Id: Ie9fe536f28d05953519a9fd477c5eaa3923be991
Fixes: 122685915
2019-01-11 09:17:27 -05:00
Alexey Kuzmin
233f345239 Merge "Split ring and notification vibration settings" 2019-01-11 13:51:16 +00:00
Kevin Chyn
f0a0180b3f Merge "Update Settings to match new mocks" 2019-01-11 06:14:47 +00:00
Kiyoung Kim
37bd3482ca Schematize ADB system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
2019-01-11 12:39:13 +09:00
Naina Nalluri
45f4f49ace Merge "Revert "Developer option to enable CBRS"" 2019-01-11 03:14:35 +00:00
Kevin Chyn
15128cf2e2 Update Settings to match new mocks
Fixes: 122119972

Test: layout looks good
Change-Id: I259f7e706a6be18edc0e595ff6c3fdccf41b1178
2019-01-10 19:09:25 -08:00
Console Chen
25dc1f1f0d Merge "Adding the ability to customize the subtitle on an unavailable slice" 2019-01-11 03:07:50 +00:00
Svet Ganov
27b0668c91 Update tests due to new platform API intruducing ambibuity
Tests: atest MockLocationAppPreferenceControllerTest
       atest RestrictAppPreferenceControllerTest

bug:111061782

Change-Id: I287d40d5b1e5a6fff6a85cb5ba6a8b87096da9d4
2019-01-10 18:48:46 -08:00
Yiwei Zhang
bcc94e40e5 Merge "GUP: Fixed some typos and update some values" 2019-01-11 02:40:30 +00:00
cosmohsieh
1e2e6140cf Change intent filter string of NetworkRequestDialogActivity
Bug: 117399926
Test: atest NetworkRequestDialogActivityTest
Change-Id: I204b528e4b920c052fbd6626caf2f36e7d80914e
2019-01-11 10:34:50 +08:00
Yiwei Zhang
5735199641 GUP: Fixed some typos and update some values
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
2019-01-11 08:13:39 +08:00
Salvador Martinez
0c388c5f4e Merge "Polish some behaviors of the battery saver schedule screen" 2019-01-10 22:58:55 +00:00
jackqdyulei
22904a05b7 Add UiBlocker for DashboardFragment
If DashboardFragment detects blocker controllers, it won't display
until:
1. All blocking controllers finish bg works.
2. Timeout

This CL adds UiBlockerController to control this behavior and
BlockingSlicePreferenceController as an example.

Bug: 120803703
Test: atest SettingsUnitTests
Change-Id: I66fc194776d46ee49b3ec7685f3167834e673ba2
2019-01-10 14:25:43 -08:00
TreeHugger Robot
3137429192 Merge "Update disable app warning text" 2019-01-10 20:50:45 +00:00
Hai Shalom
b5c286a4a4 [WPA3] Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers
Following API Council review:
Rename allowedGroupMgmtCiphers to allowedGroupManagementCiphers in all instances
in order to be consistend with existing members.

Bug: 122616519
Test: atest com.android.server.wifi
Change-Id: I42496a0c9fa1034beffd9b05eeafd2f0a75eb1a8
2019-01-10 12:42:46 -08:00
TreeHugger Robot
32d8a32ac0 Merge "Change summary of privacy page" 2019-01-10 20:15:46 +00:00