Commit Graph

5352 Commits

Author SHA1 Message Date
Beverly
40bcefc0bb Clarify secondary dnd media text.
Bug: 63077372
Test: manual
Change-Id: I38f249851fc5122e89dd3cc33124068598475751
2017-12-14 15:29:28 -05:00
Beverly
69294a5d5c Simplify DND Behavior secondary text
Bug: 63077372
Change-Id: I0ac305ff429de27a65667441703b938305d8a03f
Fixes: 70627215
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests -j40
2017-12-13 15:23:03 -05:00
Antony Sargent
6b66cd3bda Merge "Revert "Update style names due to theme migration"" 2017-12-06 19:39:56 +00:00
Antony Sargent
49820f4c65 Revert "Update style names due to theme migration"
This reverts commit cc16feb726.

Reason for revert: in b/70031670 we discovered some problems in
the support library side change (ag/3136307), and it will take a
little while to fix those problems so we need to temporarily
revert the support library changes to unblock a push of the
support library to google3.

Change-Id: I2086f434d5bcb518e474734b6d2b98a4b1c194d2
2017-12-06 17:57:01 +00:00
Beverly
323522171d Updates to automatic rule pages in Settings
- Re-added metrics for zen behavior preference controllers
- Dialogs in zen mode settings are rotate-friendly
- Automatic rules are refreshed on update state
- User-created (and default) automatic rules are always priority only and user cannot change this
- Automatic rules redesigned to have headers

Test: make ROBOTEST_FILTER=ZenModeAutomaticRulesPreferenceControllerTest RunSettingsRoboTests -j40
Bug: 63077372
Fixes: 68324465
Fixes: 69057696
Change-Id: I163acef2715dd4e60bfc08207f0e22352c4c0e28
2017-12-06 10:14:08 -05:00
Antony Sargent
508190bb9f Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7 am: fe20f69e3f am: 51950965e9
am: 5f4e32ae5f

Change-Id: Ie2d2b7d7479fcc2148476ff7a122c8f17a4d1f56
2017-12-05 23:31:00 +00:00
Antony Sargent
5f4e32ae5f Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7 am: fe20f69e3f
am: 51950965e9

Change-Id: I30014b81a3eb514caf030ea5efb72694f434e305
2017-12-05 23:23:05 +00:00
Antony Sargent
51950965e9 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7
am: fe20f69e3f

Change-Id: I1d1eb74920d9b191bb7f0365620d0dd1d372b923
2017-12-05 23:17:11 +00:00
Antony Sargent
fe20f69e3f Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9
am: 26e5f828f7

Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a
2017-12-05 23:10:05 +00:00
TreeHugger Robot
ac301bb5e5 Merge "Add XML attribute to toggle on/off LocationModePreferenceController." 2017-12-05 22:53:21 +00:00
Ben Lin
607cd20a16 Add XML attribute to toggle on/off LocationModePreferenceController.
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=LocationModePreferenceControllerTest all pass.
Bug: 62378711

Change-Id: I0d054171b80b5677dba2a7a02fb076660ed5cc0d
2017-12-05 11:56:00 -08:00
Beverly
b7b74226c3 Added footers to zen mode settings
ZenModeSettings Footer displays when DND will end
ZenModeBehaviorSettings Footer describes why dnd behavior cannot be changed when
in alarms only or total silence mode

Test: make RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: Iefbb3995da4af2b210c8e0c3c3a798d3c613e275
2017-12-05 14:35:31 -05:00
Antony Sargent
26e5f828f7 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
am: db6e747ab9

Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
2017-12-05 17:32:41 +00:00
Antony Sargent
9867a3ef85 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
am: 3d7dbd6407

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
am: 24f063a207

Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
am: 9cf1fc73f1

Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1 Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
am: eee62e1846

Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846 Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3 Reword bluetooth confirmation dialog
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
2017-12-05 17:13:36 +00:00
Chien-Yu Chen
890c9a7ad3 Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
am: fa3af7b0e7

Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
2017-12-03 03:28:40 +00:00
jackqdyulei
b79e0d4279 Add preferences in new connected device page
1. Add device preference
2. connection preference

This cl add click action for Add device preference. Action for
connection preference will be added in future cl.

Bug: 69333961
Test: Screenshot | RunSettingsRoboTests
Change-Id: Ifb1afc8371ee45165ea22a7a195a774ba04fdeea
2017-12-01 12:28:15 -08:00
Chien-Yu Chen
7bae205499 Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
2017-12-01 08:11:56 -08:00
TreeHugger Robot
7ec34c1781 Merge "Fix robolectric tests" 2017-11-29 22:51:27 +00:00
Fan Zhang
0fea400314 Fix robolectric tests
- Override a button style to avoid dependency on new style name.

Change-Id: I62935afe16424d8ddf0c2448327d76eda00440a5
Fixes: 69918100
Test: robotests
2017-11-29 12:55:19 -08:00
TreeHugger Robot
06aeaa4cf2 Merge "Rename search bar corner radius dimen to allow oem override" 2017-11-29 20:33:19 +00:00
Fan Zhang
d643a42b5d Rename search bar corner radius dimen to allow oem override
Bug: 68814716
Test: visual
Change-Id: Iac4da717aea9fd1c3e9cec089464cbb4dccb75f9
2017-11-28 18:02:47 -08:00
TreeHugger Robot
b1edae2d04 Merge "Update Settings to use DeviceDefault colored button" 2017-11-28 21:23:49 +00:00
TreeHugger Robot
c859721413 Merge "Update style names due to theme migration" 2017-11-27 23:14:02 +00:00
TreeHugger Robot
d5fff3645a Merge "Increase max char limit for sim slot number" 2017-11-27 20:06:41 +00:00
TreeHugger Robot
79bd22ae5b Merge "Fix comma typo" 2017-11-27 19:43:19 +00:00
TreeHugger Robot
42243ef66f Merge "Update string for battery saver" 2017-11-27 19:25:00 +00:00
jeffreyhuang
ade10ca2ef Fix comma typo
Bug: 69672170
Test: Manual
Change-Id: Ib32695ca8ecf19e3d0c4174ce7fbd9f2af31c29a
2017-11-27 10:12:06 -08:00
Antony Sargent
cc16feb726 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
2017-11-27 18:06:48 +00:00
jeffreyhuang
e1d5a1eaac Increase max char limit for sim slot number
- translations to other languages requires a few more characters

Bug: 69672094
Test: Compiles
Change-Id: I59c1ced9098b02718599a1feb7e64903e8dbd7f7
2017-11-27 10:06:37 -08:00
TreeHugger Robot
e2e0ee33f5 Merge "Update search bar visual" 2017-11-23 00:57:34 +00:00
Fan Zhang
5830dcc100 Update search bar visual
- Rounded cornal radius is now 1/2 of total height. This makes the
search bar look like a pill.

Bug: 68814716
Test: visual
Change-Id: Ie572d11c0df8c42b4903bfe238e80eeb54e60fd0
2017-11-22 15:12:06 -08:00
jackqdyulei
35f5d2e66c Update string for battery saver
"Battery saver" -> "Battery Saver"

Bug: 69480774
Test: Build
Change-Id: I6e1598c19ed6d85a15d6178ae010c3dd8cfe25be
2017-11-22 10:44:36 -08:00
jackqdyulei
75ea67c9f4 Update ConnectedDeviceGroupController
Get the PreferenceGroup there and add/remove preference
through the callback

Also add ConnectedBluetoothDeviceUpdater which only filter
the connected device.

Bug: 69333961
Test: RunSettingsRoboTests

Change-Id: Ia2ab6b6708329227929d6fe442df3a8d45bf86f5
2017-11-21 14:44:35 -08:00
Jeffrey Huang
75077060f2 Merge "Additional search terms for about phone v2" 2017-11-16 21:09:00 +00:00
Andrew Sapperstein
0efac4693f Update Settings to use DeviceDefault colored button
Uses new Widget.DeviceDefault.Button.Colored style.
Also updates some of the styles to use DeviceDefault
instead of Material styles for a bunch of button styles.

Bug: 64122537
Bug: 69314526
Test: ag/3228846
Change-Id: I478dfdb5ea67ae1882cfee66050ed44fcda3d80d
2017-11-15 17:23:24 -08:00
jeffreyhuang
4181a573e6 Additional search terms for about phone v2
Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I07172133aa61a36c8c499237d4acaa6a2f392ba0
2017-11-15 15:28:23 -08:00
Fan Zhang
a590aa8de7 Merge "Misc fixes" 2017-11-15 22:40:31 +00:00
TreeHugger Robot
d76496dca1 Merge "Added zen settings messages and calls preferences." 2017-11-15 21:59:47 +00:00
Bruno Martins
b011e2a55b Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26 am: 7431ad3a80
am: 440373dbde

Change-Id: I605e13adb0e050ee73e646fa13c62f88271271b6
2017-11-15 21:59:25 +00:00
Bruno Martins
440373dbde Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26
am: 7431ad3a80

Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
2017-11-15 21:56:18 +00:00
Bruno Martins
7431ad3a80 Merge "Settings: Add notification channel for SIM selection"
am: c543d5ba26

Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
2017-11-15 21:54:16 +00:00
Antony Sargent
e14d38a383 Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.

Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)

Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
2017-11-15 18:38:43 +00:00
Jeffrey Huang
f1b6d629bf Merge changes Ibf5dc65b,I0cea3f76,I0dda78b4
* changes:
  Phone number in about phone v2
  Dynamic preferences for sim status
  Dynamic preferences for IMEI
2017-11-15 18:00:39 +00:00
Fan Zhang
cb4fb095d7 Misc fixes
- align wifi connection dialog edittext to viewStart
- Generate a random password when wifi tether password is null

Change-Id: Ia5ca6098c9ef4641cb4f8b4e2b126da061e62830
Fixes: 67749595
Fixes: 64967301
Test: robotests
2017-11-14 16:53:28 -08:00