Commit Graph

45616 Commits

Author SHA1 Message Date
Lei Yu
c6b50f1d77 Merge "Update strings in battery settings." into pi-dev am: faa5c2281e
am: 37a0f5cf7d

Change-Id: I55da31048dd2804198272f8016e135860a5433ee
2018-05-10 16:54:00 -07:00
TreeHugger Robot
a3d991cc0c Merge "Make it so client code does not tie tether to wifi" 2018-05-10 23:44:01 +00:00
TreeHugger Robot
c36030cc33 Merge "Add a new enum to support available/non-searchable settings" 2018-05-10 23:20:21 +00:00
Lei Yu
1e014ca87c Merge "Use user doze whitelist in anomaly detection" into pi-dev am: d257c1a2d9
am: aeb5b38c52

Change-Id: Id75f81f42a2de2b459e6fd0c705e916324021959
2018-05-10 15:57:28 -07:00
Fan Zhang
6600bbaf10 Merge "Remove search option in Magnification settings" 2018-05-10 22:14:06 +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
Fan Zhang
8f699b270d Add a new enum to support available/non-searchable settings
Bug: 72748524
Test: existing robotests
Change-Id: I46b2b4a4fa33d8a94de83829cc1eddc99e89b247
2018-05-10 13:53:59 -07:00
rafftsai
f5fffe3da6 Remove search option in Magnification settings
- AccessibilitySettingsForSetupWizardActivity add extra argument to hide
search and help menu. It applies to AccessibilitySettingsForSetupWizard.
Add extra in MagnificationPreferenceFragment when launch from SUW.

Fixes: 74195957
Test: am start -a android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW

Change-Id: I8314e3a01907e0befa63b96271bfc2b15c5a1d50
2018-05-10 13:49:30 -07:00
Salvador Martinez
188af9439e Make it so client code does not tie tether to wifi
The wifi service already handles turning off tethering if
multi-interface is/isn't supported. We don't need to do tie wifi
and tethering stuff together in the UI.

Test: robotests still pass
Bug: 79213401
Change-Id: I699dfe2d7646f248a54faa5a8429176697614cdf
2018-05-10 13:36:08 -07: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
Meng Wang
3a4e213037 Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev am: 6fcafbe5bf
am: ed6037dffa

Change-Id: I163fb4c27334f64362033a94ebaad55387c8da61
2018-05-10 12:10:09 -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
Fan Zhang
4979f434fc Merge "Fix a typo in AndroidManifest.xml" into pi-dev am: 3a9fbac582
am: e50f5effa0

Change-Id: I68689c03344b1987b905b32f95f91d82b5a9e129
2018-05-10 11:32:23 -07: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
TreeHugger Robot
88c10e9169 Merge "Add shorter string for Previously connected device" 2018-05-10 17:02:15 +00:00
Beverly Tai
127777b6e7 [automerger skipped] Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev am: 60a9ed8627
am: c93a0dc2fb  -s ours

Change-Id: If63814774deff6cc157115ddb18bd1eea48432d5
2018-05-10 06:41:00 -07: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
hjchangliao
0d1f1d3cd7 Add shorter string for Previously connected device
Original string is too long to show in title bar,
Add a shorter string to avoid clipped.

Change-Id: Ib8b14100f71cb65862036235f290f9f548949b79
Fixes: 78127123
Test: Manual test
2018-05-10 16:18:33 +08: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
f95ed0925b Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev am: 7e31e22f57
am: 82db752ef0

Change-Id: I7e9a40b08afebedb7b44a6345cda8b2564db315d
2018-05-09 20:46:27 -07: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
c1884b7c70 [automerger skipped] Merge changes from topic "swipe-up-gesture-overlay" into pi-dev am: 3167f72961
am: 85833473e1  -s ours

Change-Id: Iee0dd7da6b06856f2ed73fb0ed1efb10d127acc1
2018-05-09 20:13:40 -07: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
bfedf3d506 Merge changes Ifa91ad93,I14f9696a into pi-dev am: d067cbcfc9
am: 9e639df738

Change-Id: Ic156328bb3249d9c82cc4ea38dc17bc39ddf0d27
2018-05-09 19:25:25 -07: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
7e4f8a28eb Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am: cda8a44cee
am: f94119e739

Change-Id: If887d0c414649489d483bf523316d1f960798000
2018-05-09 16:56:30 -07:00
Fan Zhang
33b585a831 Merge "Fix a concurrent modification exception in Slice provider." into pi-dev am: 350c5b3c40
am: b8b9e69a94

Change-Id: I7827b526be72fb2678d7bb662e6c13f722a8aaa9
2018-05-09 16:53:43 -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
TreeHugger Robot
54bf10b49d Merge "Imports com.android.settings.R to fix build breakage in master" 2018-05-09 22:59:39 +00:00
Lei Yu
fdf09b4d5a Merge "Use WRAP_CONTENT for battery saver button" into pi-dev am: 1dbe185db2
am: 1f429286d2

Change-Id: Ia95728a05d7473c6898046141818700c8d52a97e
2018-05-09 15:28:38 -07: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