Commit Graph

44790 Commits

Author SHA1 Message Date
Fan Zhang
baab651901 Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
am: 4d6375e052

Change-Id: I08afa778d2a7a6af1cbcf3493077c964caa8d5c1
2018-05-10 16:36:58 -07:00
TreeHugger Robot
4d6375e052 Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev 2018-05-10 23:29:03 +00:00
Fan Zhang
dc00efa666 Use shorter string for MasterClear to stop truncating title
Change-Id: Ic1c639724c06d4671d4703b9862e77f673541f77
Fixes: 77904702
Test: visual
2018-05-10 15:19:12 -07:00
Lei Yu
c051396951 Merge "Add action for low battery tip" into pi-dev
am: ed7101cd2a

Change-Id: If303953ec4493c20d531b6845a392ba58585c483
2018-05-10 15:07:02 -07:00
TreeHugger Robot
ed7101cd2a Merge "Add action for low battery tip" into pi-dev 2018-05-10 21:52:43 +00:00
Lei Yu
37a0f5cf7d Merge "Update strings in battery settings." into pi-dev
am: faa5c2281e

Change-Id: I0196ea02f6e3ca9ff533feae1942540daa35e0c2
2018-05-10 14:51:03 -07:00
TreeHugger Robot
faa5c2281e Merge "Update strings in battery settings." into pi-dev 2018-05-10 21:28:31 +00:00
Lei Yu
aeb5b38c52 Merge "Use user doze whitelist in anomaly detection" into pi-dev
am: d257c1a2d9

Change-Id: I0d7d66e96395197baed09e012b52be83bb2f4129
2018-05-10 13:21:47 -07:00
Lei Yu
d257c1a2d9 Merge "Use user doze whitelist in anomaly detection" into pi-dev 2018-05-10 20:10:42 +00:00
Lei Yu
8d538ef12d Add action for low battery tip
The action should be same as EarlyWarningTip.
1. Option to "turn on battery saver" is battery is low
2. Or show "battery saver is on" and take user to "battery saver" page.

Fixes: 76113067
Test: RunSettingsRoboTests

Change-Id: I896358305a8ae4cd97c3864bbf6e556b4d025dd7
2018-05-10 12:58:47 -07:00
Meng Wang
ed6037dffa Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev
am: 6fcafbe5bf

Change-Id: Iedc26b0440817548fe6a014c5d7454d2f8d8a88b
2018-05-10 12:07:38 -07:00
TreeHugger Robot
6fcafbe5bf Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev 2018-05-10 18:57:39 +00:00
Lei Yu
bc54cedabd Update strings in battery settings.
1. Message in high usage dialog
2. Title in app usage list

Change-Id: Iac610483e10e8d2a93a18ca664aec17d9561aaf8
Fixes: 78638843
Test: RunSettingsRoboTests
2018-05-10 11:31:29 -07:00
Fan Zhang
e50f5effa0 Merge "Fix a typo in AndroidManifest.xml" into pi-dev
am: 3a9fbac582

Change-Id: Ifa4fef188cdcd80ff997575ed593f67c9bb7fe86
2018-05-10 11:20:24 -07:00
Fan Zhang
3a9fbac582 Merge "Fix a typo in AndroidManifest.xml" into pi-dev 2018-05-10 18:07:27 +00:00
Beverly Tai
c93a0dc2fb Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
am: 60a9ed8627

Change-Id: I9a16629067a76f2113c6ed312796aa47dda7f649
2018-05-10 06:35:13 -07:00
Beverly Tai
60a9ed8627 Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev 2018-05-10 13:28:47 +00:00
Meng Wang
6de3389b92 Revert "Remove provisioning dialog from wifi-tethering"
This reverts commit 81ca3dd4c0.

Reason for revert:
This breaks carrier requirement to show error dialog/roaming warning.
Will make an entitlement app change to suppress the progress dialog
so that if the entitlement check succeeds no dialog will be shown
in most cases.

Bug: 78680359
Change-Id: I98d2aa5cc676308b1e2d16bf877dc6878a7bf4cb
2018-05-10 05:15:43 +00:00
ryanywlin
82db752ef0 Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev
am: 7e31e22f57

Change-Id: I118c59326c4403f350201b55b4711cc7bd92243d
2018-05-09 20:41:55 -07:00
TreeHugger Robot
7e31e22f57 Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev
* changes:
  Add hearing aid device in audio switch
  Find active device for add hearing aids device into audio switcher.
  Three methods for adding hearing aids device into audio switcher.
2018-05-10 03:31:33 +00:00
Mehdi Alizadeh
85833473e1 Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
am: 3167f72961

Change-Id: Iac284f04b0ba862064ea5d2822819eaf31dcb4c0
2018-05-09 20:09:15 -07:00
Mehdi Alizadeh
3167f72961 Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
* changes:
  Imports com.android.settings.R to fix build breakage
  Adds two overlay settings fields for Swipe Up gesture
2018-05-10 03:01:05 +00:00
ryanywlin
8276d966e9 Add hearing aid device in audio switch
- Add connected hearing aid device to MediaOutputPreferenceController
and HandsFreeProfileOutputPreferenceController

- Set active device to different profile depend on HisyncId

Bug: 78142719
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: Ib8fe4f06f8564572dffdce6fcc3f29578bf91bd9
2018-05-10 10:28:20 +08:00
Lei Yu
d71e8d8c87 Use user doze whitelist in anomaly detection
Bug: 77924141
Test: RunSettingsRoboTests
Change-Id: Id9503c9468292f128b76ea872d6603c49965d919
2018-05-09 19:22:57 -07:00
ryanywlin
9f407aba36 Find active device for add hearing aids device into audio switcher.
- Find active device accroding to different stream type and
output device.

- update isStreamFromOutputDevice() to identify general case like
DEVICE_OUT_BLUETOOTH_A2DP is subset of DEVICE_OUT_ALL_A2DP.

- add test case for these methods.

Bug: 78142719
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: I381135c120dbf051679bff7626d47e41f8d589da
2018-05-10 10:20:30 +08:00
Lei Yu
9e639df738 Merge changes Ifa91ad93,I14f9696a into pi-dev
am: d067cbcfc9

Change-Id: Idddf18d56322a274145be20a0c6858fcd6cd78e0
2018-05-09 19:16:16 -07:00
ryanywlin
eb5019d05a Three methods for adding hearing aids device into audio switcher.
- Add three methods for subclass to get connected device list
denpending on different profiles.

- Test case for these methods.

Bug: 78142719
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: Ia1367a53ab6a3432878a514490722871ed878954
2018-05-10 10:08:14 +08:00
Lei Yu
d067cbcfc9 Merge changes Ifa91ad93,I14f9696a into pi-dev
* changes:
  Update the BatteryTipPolicy
  Update and expose the low battery tip.
2018-05-10 02:06:19 +00:00
Mehdi Alizadeh
6df79d3d17 Imports com.android.settings.R to fix build breakage
Bug: 78908915
Bug: 78641268
Test: None

Change-Id: Ic98e58188bba211ab9e16b8915012f6ac49280ea
Merged-In: I01dc37a90f132b9052a3ecae04d4ea09a0c78c91
2018-05-09 18:54:55 -07:00
Mehdi Alizadeh
c93a97d9d5 Adds two overlay settings fields for Swipe Up gesture
Adds two overlay settings for Swipe Up gesture, one for the default
value (enabled/disabled), and another one to show/hide the Swipe Up
settings page in Settings app.

Bug: 78908915
Bug: 78641268
Test: Robotests and Manual test
Change-Id: If7bea967f3af9ebe96ab87e8a4d6d05c5daa4ed5
2018-05-09 18:44:42 -07:00
Fan Zhang
66156d68e7 Fix a typo in AndroidManifest.xml
And some drive-by clean up.

Change-Id: Ic036f8f5bec8064a5d55e0e032ce45e483323b14
Fixes: 78889604
Test: atest
2018-05-09 18:06:27 -07:00
Salvador Martinez
f94119e739 Merge "Hide hidden network spinner for non-hidden networks" into pi-dev
am: cda8a44cee

Change-Id: If55a1837c0a9e9156f11be933ac7676edcbd6af9
2018-05-09 16:47:06 -07:00
Fan Zhang
b8b9e69a94 Merge "Fix a concurrent modification exception in Slice provider." into pi-dev
am: 350c5b3c40

Change-Id: I09d3d0148b58f954cb584b5c5c63059396af8fb1
2018-05-09 16:42:36 -07:00
TreeHugger Robot
cda8a44cee Merge "Hide hidden network spinner for non-hidden networks" into pi-dev 2018-05-09 23:41:23 +00:00
TreeHugger Robot
350c5b3c40 Merge "Fix a concurrent modification exception in Slice provider." into pi-dev 2018-05-09 23:28:45 +00:00
Lei Yu
1f429286d2 Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
am: 1dbe185db2

Change-Id: I14a5de9f360b11de52ecda509fcdeca11d1af0a2
2018-05-09 15:08:09 -07:00
TreeHugger Robot
1dbe185db2 Merge "Use WRAP_CONTENT for battery saver button" into pi-dev 2018-05-09 21:54:26 +00:00
Andreas Terzis
aee672badc Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
am: b5de55fbfc

Change-Id: Ic31625e5eab080bdb007d85803b2f9eebe430dbf
2018-05-09 14:31:06 -07:00
Matthew Fritze
57c000113f Merge "Establish permanently unavailable settings" into pi-dev
am: ab68a8107c

Change-Id: I492624cf4d1fcfba85c0dc6f9042f456ce882ed5
2018-05-09 14:21:22 -07:00
Andreas Terzis
b5de55fbfc Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev 2018-05-09 21:15:43 +00:00
TreeHugger Robot
ab68a8107c Merge "Establish permanently unavailable settings" into pi-dev 2018-05-09 21:13:44 +00:00
Salvador Martinez
7e34ffdb6a Merge "Remove the Settings search keywords from Slices" into pi-dev
am: 26453818b9

Change-Id: I9dbc077c72a0ca4b29364f7eea39d3e4f82f1fdb
2018-05-09 13:41:03 -07:00
Salvador Martinez
26453818b9 Merge "Remove the Settings search keywords from Slices" into pi-dev 2018-05-09 20:30:02 +00:00
Beverly
a4d5980869 DO NOT MERGE Add zen starred contacts preference
Bug: 78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
2018-05-09 16:12:10 -04:00
android-build-team Robot
8d504b4d98 Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
am: 9110d29f13

Change-Id: Ib6ff8cf2cfde3ee12bdb757b4a691b90ba02c398
2018-05-09 13:03:38 -07:00
Fan Zhang
a55993c12c Fix a concurrent modification exception in Slice provider.
Change-Id: I87449dda9a56b5e8932dc4c6bec462195cb89348
Fixes: 79372493
Test: monkey
2018-05-09 12:51:20 -07:00
android-build-team Robot
9110d29f13 Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev 2018-05-09 19:47:02 +00:00
Lei Yu
df83cf3c29 Update the BatteryTipPolicy
1. Add "testLowBatteryTip"
2. Update default value for low battery threshold

Change-Id: Ifa91ad93f484dc806dfc176ad5ffd912824f5063
Bug: 76113067
Test: RunSettingsRoboTests
2018-05-09 12:31:54 -07:00
Lei Yu
b2f089c468 Update and expose the low battery tip.
This tip was punted however we need to bring it back to P. It happens
when battery level is low or remaining time is less than 3 hour. The
suggestion is to turn on battery saver.

1. Extend tip from EarlyWarningTip since it has most common logic
2. Update the detector to align it to battery saver notifcation in
systemui.
3. Update tip order to surface low battery tip.

Follow CL will:
1. Hook up the low battery threshold to server side
2. Add test stub for this tip, so we could trigger it by adb.

Change-Id: I14f9696a549393bf980e31838fb86afd5d9efbc7
Bug: 76113067
Test: RunSettingsRoboTests
2018-05-09 12:31:41 -07:00
Andreas Terzis
3fed7fb0e2 Increase the char limit of carrier_and_update_text to 32.
The translation of the carrier_and_update_text field
in some European languages requires 32 characters. To
accomodate these requirements increase the character
limit from 30 to 32.

Also, set the field to wrap since the name of the
carrier can be long.

Bug: 76443795
Test: manual
Change-Id: Ic4c3ed0736af0535734590340e9631108707da73
2018-05-09 12:12:01 -07:00