Commit Graph

42876 Commits

Author SHA1 Message Date
Kevin Chyn
d7b4b1b951 ChooseLockPassword shows wrong string when confirmed password is wrong
Fixes: 70561469

Test: try to setup a password/pin, but type in a wrong pw/pin
      when confirming. the button should stay as "confirm" instead of
      reverting to "next"

Change-Id: Iea570c2d869b9d561b26046d30d08f40abca0c93
2018-02-28 17:28:15 -08:00
Andreas Gampe
c3bc3bc690 Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 am: ffec1a0c68 am: 8d0a8ed985
am: 2658f2059c

Change-Id: Id4b3c85c9bf4bf7b76910e895b57d21e66c0e85f
2018-02-26 22:24:23 +00:00
Andreas Gampe
7d62a5e298 Merge changes I67dbf04a,I032f6741 am: 727ec42d8d am: 6b24cc5769
am: 257f42fd9d

Change-Id: I8bb1a61f255a1c80242ac264f061f15153df12aa
2018-02-26 22:16:49 +00:00
Andreas Gampe
2658f2059c Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 am: ffec1a0c68
am: 8d0a8ed985

Change-Id: I0eb99bc2c2d1ec67c23ad020627a2cf43cfbb71d
2018-02-26 22:16:43 +00:00
Andreas Gampe
8d0a8ed985 Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
am: ffec1a0c68

Change-Id: Ibac8d021d8d65fdab91f682b9fbfc0231a61a93f
2018-02-26 22:08:50 +00:00
Andreas Gampe
257f42fd9d Merge changes I67dbf04a,I032f6741 am: 727ec42d8d
am: 6b24cc5769

Change-Id: Ib649c224f4496785ae1eba0bce3a411eca8aa1bd
2018-02-26 22:08:42 +00:00
Andreas Gampe
6b24cc5769 Merge changes I67dbf04a,I032f6741
am: 727ec42d8d

Change-Id: I4c8ce0fa68ae3fbf2a3e835d165a766b6e6aad5c
2018-02-26 22:01:25 +00:00
Treehugger Robot
ffec1a0c68 Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
* changes:
  Settings: Disable failing test
  Settings: Disable failing test
  Settings: Fix assertThat in tests
2018-02-26 22:00:19 +00:00
TreeHugger Robot
ca4fd1b7dc Merge changes I06df032d,Ib923de28
* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests
2018-02-26 21:51:01 +00:00
Treehugger Robot
727ec42d8d Merge changes I67dbf04a,I032f6741
* changes:
  Settings: Disable failing assert
  Settings: Fix assertThat in test
2018-02-26 21:36:15 +00:00
Andreas Gampe
8f4716c401 Settings: Disable failing assert
Temporarily disable.

Bug: 73892004
Test: m RunSettingsRoboTests
Change-Id: I67dbf04ae59e54632155c3eda67c70335147fd19
2018-02-26 12:35:13 -08:00
Andreas Gampe
8123135388 Settings: Disable failing test
Disable temporarily.

Bug: 73892683
Test: m RunSettingsRoboTests
Change-Id: I8dcc30b0b090fef1f2fd8fa3c6de7bf69e8b97a9
2018-02-26 12:31:05 -08:00
Andreas Gampe
d20728e4ef Settings: Disable failing test
Disable temporarily.

Bug: 73892555
Test: m RunSettingsRoboTests
Change-Id: I85292ad20de2cb169825eccb19dff1eb82e6fbe1
2018-02-26 12:31:05 -08:00
Andreas Gampe
72eb284ae7 Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.

Found by errorprone.

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie0ab35348fa56c73e6257477a50ff130450e74e7
2018-02-26 12:26:36 -08:00
Andreas Gampe
b506fb9b19 Settings: Disable failing tests.
Temporarily disable.

Bug: 73892008
Test: m RunSettingsRoboTests
Change-Id: I06df032d4a4de84c2f9f46e5086d97f688b0c989
2018-02-26 12:24:53 -08:00
Andreas Gampe
22bad556a1 Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.

Found by errorprone.

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024
2018-02-26 12:21:06 -08:00
Andreas Gampe
025ec2ba58 Settings: Fix assertThat in test
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.

Found by errorprone.

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: I032f6741ac0c728781a9d22ab6158e7b74a30167
2018-02-26 12:13:00 -08:00
Bill Yi
d93d1de3d6 Import translations. DO NOT MERGE
Change-Id: I15e875c8272a3d3beba7f0dbd89872f70df1be4f
Auto-generated-cl: translation import
2018-02-26 12:02:29 -08:00
Zhizhi Liu
4b01eebe8b Merge "Move IconCache to SettingsLib(II)." 2018-02-26 19:22:04 +00:00
TreeHugger Robot
c98d67a0f8 Merge "Update visual disturbances text" 2018-02-26 18:42:32 +00:00
Julia Reynolds
1d3631c262 Notifications should not be in 'advanced'
Change-Id: I23f9707d9dbee5a13011bd0f2df0d837348f72cf
Fixes: 73553854
Test: RunSettingsRoboTests
2018-02-26 16:15:15 +00:00
Julia Reynolds
c1fd4902f7 Update visual disturbances text
Bug: 73455127
Test: manual
Change-Id: I8420d2493e9f10cf164dad7e1bb1a870d3b7055f
2018-02-26 09:43:26 -05:00
TreeHugger Robot
ce281e060d Merge "Fix bug causing the Overlay Settings page to be hidden behind overlays." 2018-02-26 13:38:47 +00:00
Peter Visontay
9aeaa197a9 Fix bug causing the Overlay Settings page to be hidden behind overlays.
Test: Manually using an app that displays a full-screen overlay.
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=DrawOverlayDetailsTest
Bug: 72734249

Change-Id: I84b61fea2a793bebfac025ca3a209286ceeef963
2018-02-26 12:04:57 +00:00
Yoshinori Hirano
96cb9d624f Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" am: 8378efc6af -s ours am: 942249a2dd -s ours
am: e847fbe6a0  -s ours

Change-Id: Ia61630b201a283198113d0cc5751ab5892768543
2018-02-24 23:59:56 +00:00
Yoshinori Hirano
e847fbe6a0 Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" am: 8378efc6af -s ours
am: 942249a2dd  -s ours

Change-Id: I23af2770255199348eaa8c69d990ff2907ff90de
2018-02-24 23:54:26 +00:00
Yoshinori Hirano
942249a2dd Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE"
am: 8378efc6af  -s ours

Change-Id: Ic3274cd389282ac819d41830fa907d7fcf9ddb61
2018-02-24 23:48:50 +00:00
Treehugger Robot
8378efc6af Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" 2018-02-24 23:28:45 +00:00
Yoshinori Hirano
d3bb6c6459 Add SettingsMultiSelectListPreference style DO NOT MERGE
There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.

Fixes: 66928311
Test: manual - Add a new APN and tap Bearer

Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
2018-02-24 16:00:05 +00:00
TreeHugger Robot
572efd22dd Merge "More renaming in DashboardFragment" 2018-02-24 02:58:32 +00:00
TreeHugger Robot
cfa486f784 Merge "Update location and accessibility summary." 2018-02-24 02:29:25 +00:00
TreeHugger Robot
5a46ea547b Merge "Rename Indexable::getAllPreferenceControllers." 2018-02-24 02:05:25 +00:00
TreeHugger Robot
a0de28d0de Merge "Update the Bluetooth Active Device state in the Device Manager" 2018-02-24 01:07:45 +00:00
Fan Zhang
f7843adabd More renaming in DashboardFragment
getPreferenceControllers() -> createPreferenceControllers() for the same
reason as in ag/3647936

Bug: 73668763
Test: robotests
Change-Id: I97670a91a2a38d1c844d1b9d37f4222c5e6f45a0
2018-02-23 16:56:30 -08:00
TreeHugger Robot
81977ea25f Merge "Add divider in About phone screen." 2018-02-24 00:53:34 +00:00
Fan Zhang
aed8994f6f Rename Indexable::getAllPreferenceControllers.
To getPreferenceControllers. "all" is redundant. Then internally, the
old getPreferenceControllers() is renamed to
createPreferenceControllers() to emphasize the controllers are created
from code (versus the ones created from xml).

Bug: 73668763
Test: robotest
Change-Id: Ifec46aefdc2a418031c8e152028b30bdcd396fc7
2018-02-23 16:37:28 -08:00
Hansong Zhang
d439b3cb42 Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" am: ad84c9552d -s ours am: d2040309ca
am: c9f1e73dc7  -s ours

Change-Id: I53faa69e09a06948e6ff47ee1d8a0848ccbca592
2018-02-24 00:32:41 +00:00
Hansong Zhang
c9f1e73dc7 Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" am: ad84c9552d -s ours
am: d2040309ca

Change-Id: I93238df1e9d889817f0d025203ac437c12cfa2d8
2018-02-24 00:26:09 +00:00
Hansong Zhang
d2040309ca Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports"
am: ad84c9552d  -s ours

Change-Id: Icb23ebb9baaf02ac0f9469e9d4601c67d22ba5ad
2018-02-24 00:19:01 +00:00
TreeHugger Robot
8e6d5ad27e Merge "Instantiate pref controllers from xml if it's defined." 2018-02-24 00:13:45 +00:00
Doris Ling
8b610fc5c5 Update location and accessibility summary.
- change ON/OFF to On/Off.

Change-Id: I5c9536aaa231befe55d002be33e47a4e43779863
Fixes: 73774291
Test: visual
2018-02-23 15:49:53 -08:00
TreeHugger Robot
158096d25d Merge "Settings: Move DefaultAppInfo CandidateInfo to SettingsLib" 2018-02-23 23:31:47 +00:00
Treehugger Robot
ad84c9552d Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" 2018-02-23 23:07:26 +00:00
TreeHugger Robot
43a2ac6c7c Merge changes from topic "ww_5_auto_restrict"
* changes:
  Add special check for excessive bg anomaly
  Add auto restriction for excessive background
2018-02-23 22:56:48 +00:00
Fan Zhang
917f101899 Instantiate pref controllers from xml if it's defined.
- If a <preference> tag also defines a controller, we will try to
  instantiate it before displaying the UI. The same logic is shared by
  BaseSearchIndexProvider so it also drives search suppression.

- If user also defines a list of controllers programatically, the
  programatically created ones takes precedence.

Bug: 73668763
Test: WIP
Change-Id: I7aecec270bcd3af261e012ef1f6995d2a523cfa1
2018-02-23 14:08:51 -08:00
Dake Gu
fef14cac00 Settings: Move DefaultAppInfo CandidateInfo to SettingsLib
Bug: 3600711
Test: Moved DefaultAppInfoTest to SettingsLib
      m RunSettingsRoboTests
Change-Id: If9e2288009277f1940b9769790b78bb0a58b626a
2018-02-23 13:23:16 -08:00
TreeHugger Robot
7d8e770bcb Merge "Actually test for truth." 2018-02-23 20:53:16 +00:00
TreeHugger Robot
f783267a57 Merge "Fix reset button being disabled." 2018-02-23 20:51:28 +00:00
Pavlin Radoslavov
c7715a5519 Update the Bluetooth Active Device state in the Device Manager
The Bluetooth Active Device state should be updated for all
CachedBluetoothDevice entries.
This should be done inside CachedBluetoothDeviceManager in SettingsLib
instead of BluetoothDeviceUpdater in the Settings app.

Bug: 72316092
Test: Manual - two headsets and switching the active device
Change-Id: If379bb0853dcd78385430cf14192e9adfae4ecd0
2018-02-23 12:32:23 -08:00
Maurice Lam
b93f6c171c Merge "Improve pattern layout for tiiiny screens" 2018-02-23 19:00:43 +00:00