OSDN Git Service
timhypeng [Fri, 11 May 2018 17:32:40 +0000 (10:32 -0700)]
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev am:
4017944d17
am:
fe323a7359
Change-Id: I97fe217535a8d9f8da756505c7b60662202a3867
timhypeng [Fri, 11 May 2018 17:21:55 +0000 (10:21 -0700)]
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
am:
4017944d17
Change-Id: I7eefdbbc9ff9a1892b3309c4d284d2358d589b0f
TreeHugger Robot [Fri, 11 May 2018 17:02:08 +0000 (17:02 +0000)]
Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev
AL Ho [Fri, 11 May 2018 06:58:10 +0000 (14:58 +0800)]
Update Accessibility vibration settings.
- Get notification vibration and haptic feedback intensity respectively.
- Use xliffs to compose these strings.
- Use the version that passed in Vibrator.class to get Vibrator
instance.
- Refactor switch/case part in getSummary() of
VibrationIntensityPreferenceController.
Let AccessibilitySettings and VibrationIntensityPreferenceController
both call it.
- Add robolectric test for method: updateVibrationSummary().
- Refine test method, use real preference and test summary value.
- Remove redundancy.
Bug:
75322064
Test: make ROBOTEST_FILTER=AccessibilitySettingsTest RunSettingsRoboTests
Change-Id: Ia3c7447b1ab1e336b36ad439800b673821417e48
Merged-In: Ia3c7447b1ab1e336b36ad439800b673821417e48
AL HO [Fri, 11 May 2018 07:55:53 +0000 (00:55 -0700)]
[automerger skipped] Merge "Update Accessbility vibration settings." into pi-dev am:
204dcfdb4c
am:
d507ddd71c -s ours
Change-Id: Ia7063753b264c4baa9e3cf329a432419e8d05e76
AL HO [Fri, 11 May 2018 07:23:51 +0000 (00:23 -0700)]
Merge "Update Accessbility vibration settings." into pi-dev
am:
204dcfdb4c
Change-Id: I946902304191ca136cdb960683cdf742cb8ff9a3
AL HO [Fri, 11 May 2018 07:11:14 +0000 (07:11 +0000)]
Merge "Update Accessbility vibration settings." into pi-dev
timhypeng [Fri, 11 May 2018 06:16:35 +0000 (14:16 +0800)]
Add discoverable footer preference string when bluetooth is off
Bug:
79294219
Test: build pass
Change-Id: Iea8c75bed099466060405d81b793404619059642
Fan Zhang [Fri, 11 May 2018 06:04:02 +0000 (23:04 -0700)]
[automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev am:
9e629edb09
am:
b76c1ba682 -s ours
Change-Id: I52c4160b9f2e5c713c0174b2e27e475b3ea44f31
Fan Zhang [Fri, 11 May 2018 05:59:31 +0000 (22:59 -0700)]
Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
am:
9e629edb09
Change-Id: Ibab3710f94c418dd345b76fb4d2fd3f486b8c499
TreeHugger Robot [Fri, 11 May 2018 05:49:29 +0000 (05:49 +0000)]
Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 04:46:53 +0000 (04:46 +0000)]
Merge "Fix a strict mode violation in SystemUpdatePrefController"
hughchen [Fri, 11 May 2018 04:25:34 +0000 (21:25 -0700)]
Merge "Add Pair new device on Bluetooth screen" into pi-dev am:
b87eb6aa06
am:
c183f43dfe
Change-Id: I94d06345dc2911298b9a45634f989516a0939694
hughchen [Fri, 11 May 2018 04:20:59 +0000 (21:20 -0700)]
Merge "Add Pair new device on Bluetooth screen" into pi-dev
am:
b87eb6aa06
Change-Id: I4ca53abcb7bb28cafc8b7527c82a97f6b70545f8
TreeHugger Robot [Fri, 11 May 2018 04:12:53 +0000 (04:12 +0000)]
Merge "Add “Pair new device” on Bluetooth screen" into pi-dev
Fan Zhang [Wed, 9 May 2018 22:42:00 +0000 (15:42 -0700)]
Fix a strict mode violation in SystemUpdatePrefController
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Bug:
78626509
Test: robotests
AL Ho [Wed, 28 Mar 2018 04:06:30 +0000 (12:06 +0800)]
Update Accessbility vibration settings.
- Get notification vibration and haptic feedback intensity repectively.
- Use xliffs to compose these strings.
- Use the version that passed in Vibrator.class to get Vibrator
instance.
- Refactor switch/case part in getSummary() of
VibrationIntensityPreferenceController.
Let AccessibilitySettings and VibrationIntensityPreferenceController
both call it.
- Add robolectric test for method: updateVibrationSummary().
- Refine test method, use real preference and test summary value.
- Remove redundancy.
Bug:
75322064
Test: make ROBOTEST_FILTER=AccessibilitySettingsTest RunSettingsRoboTests
Change-Id: Ia3c7447b1ab1e336b36ad439800b673821417e48
Merged-In: Ia3c7447b1ab1e336b36ad439800b673821417e48
hughchen [Thu, 10 May 2018 11:28:44 +0000 (19:28 +0800)]
Add “Pair new device” on Bluetooth screen
* Add AddDevicePreferenceController in bluetooth_screen.xml
Bug:
79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I4e43e31d05c297ca206cd2b0f747bb615c3dfcd4
Lei Yu [Fri, 11 May 2018 01:26:48 +0000 (18:26 -0700)]
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev am:
b98039e263
am:
5740dd8604
Change-Id: I0b982809ccb0419b5773fb05c9b59f402dbbcbee
Doris Ling [Fri, 11 May 2018 01:14:54 +0000 (18:14 -0700)]
Merge "Map the new category keys to the corresponding fragment." into pi-dev am:
be5fa599be
am:
b04528670b
Change-Id: I44e1cc9b2e631b19bb51079230821d5e59f496ec
Lei Yu [Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)]
Merge "Add help uri for smart battery page" into pi-dev am:
64135745b9
am:
ae09975605
Change-Id: I04595941491f6d2747cbf7c6db03afad166fb6df
Lei Yu [Fri, 11 May 2018 01:05:59 +0000 (18:05 -0700)]
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev
am:
b98039e263
Change-Id: Ie12a079ea1ab083772d3b6c08d2db51157a9315b
Doris Ling [Fri, 11 May 2018 01:03:05 +0000 (18:03 -0700)]
Merge "Map the new category keys to the corresponding fragment." into pi-dev
am:
be5fa599be
Change-Id: Ie55eee4ac77b9ce9be5f9d1ff3a0bb769fb2f5b9
Fan Zhang [Fri, 11 May 2018 01:02:38 +0000 (18:02 -0700)]
[automerger skipped] Merge "Remove search option in Magnification settings" into pi-dev am:
f9b93310c5
am:
ecd3b2da54 -s ours
Change-Id: I99a647a6f5b29093ce64be9c19622a3bde10a359
Lei Yu [Fri, 11 May 2018 00:49:22 +0000 (00:49 +0000)]
Merge "Fix a bug in AnomalyDetectionJobService" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 00:46:42 +0000 (00:46 +0000)]
Merge "Map the new category keys to the corresponding fragment." into pi-dev
Fan Zhang [Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)]
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev am:
4d6375e052
am:
baab651901
Change-Id: I9a024644f81a62bd5cfce912e96bb37320cdab31
Lei Yu [Fri, 11 May 2018 00:34:01 +0000 (17:34 -0700)]
Merge "Add help uri for smart battery page" into pi-dev
am:
64135745b9
Change-Id: I85102ee5824c2b8e52b638cee17334fe65132c9f
Fan Zhang [Wed, 9 May 2018 22:42:00 +0000 (15:42 -0700)]
Fix a strict mode violation in SystemUpdatePrefController
Change-Id: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Merged-In: I4770b878b6f69318f08f8974c5c4d2690c5611d4
Fixes:
78626509
Test: robotests
Lei Yu [Fri, 11 May 2018 00:25:45 +0000 (17:25 -0700)]
Merge "Add action for low battery tip" into pi-dev am:
ed7101cd2a
am:
c051396951
Change-Id: If2fee93c5ab5ba96fb843b11633f5704043b3067
TreeHugger Robot [Fri, 11 May 2018 00:12:31 +0000 (00:12 +0000)]
Merge "Add help uri for smart battery page" into pi-dev
Fan Zhang [Fri, 11 May 2018 00:01:45 +0000 (17:01 -0700)]
Merge "Remove search option in Magnification settings" into pi-dev
am:
f9b93310c5
Change-Id: I626e6ebf41395938abf74f004612e982a0ed8005
Fan Zhang [Thu, 10 May 2018 23:56:02 +0000 (23:56 +0000)]
Merge "Remove search option in Magnification settings" into pi-dev
Lei Yu [Thu, 10 May 2018 23:54:00 +0000 (16:54 -0700)]
Merge "Update strings in battery settings." into pi-dev am:
faa5c2281e
am:
37a0f5cf7d
Change-Id: I55da31048dd2804198272f8016e135860a5433ee
TreeHugger Robot [Thu, 10 May 2018 23:44:01 +0000 (23:44 +0000)]
Merge "Make it so client code does not tie tether to wifi"
Fan Zhang [Thu, 10 May 2018 23:36:58 +0000 (16:36 -0700)]
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
am:
4d6375e052
Change-Id: I08afa778d2a7a6af1cbcf3493077c964caa8d5c1
TreeHugger Robot [Thu, 10 May 2018 23:29:03 +0000 (23:29 +0000)]
Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev
TreeHugger Robot [Thu, 10 May 2018 23:20:21 +0000 (23:20 +0000)]
Merge "Add a new enum to support available/non-searchable settings"
Lei Yu [Thu, 10 May 2018 22:57:28 +0000 (15:57 -0700)]
Merge "Use user doze whitelist in anomaly detection" into pi-dev am:
d257c1a2d9
am:
aeb5b38c52
Change-Id: Id75f81f42a2de2b459e6fd0c705e916324021959
Fan Zhang [Thu, 10 May 2018 22:10:19 +0000 (15:10 -0700)]
Use shorter string for MasterClear to stop truncating title
Change-Id: Ic1c639724c06d4671d4703b9862e77f673541f77
Fixes:
77904702
Test: visual
Fan Zhang [Thu, 10 May 2018 22:14:06 +0000 (22:14 +0000)]
Merge "Remove search option in Magnification settings"
Lei Yu [Thu, 10 May 2018 22:07:02 +0000 (15:07 -0700)]
Merge "Add action for low battery tip" into pi-dev
am:
ed7101cd2a
Change-Id: If303953ec4493c20d531b6845a392ba58585c483
TreeHugger Robot [Thu, 10 May 2018 21:52:43 +0000 (21:52 +0000)]
Merge "Add action for low battery tip" into pi-dev
Lei Yu [Thu, 10 May 2018 21:51:03 +0000 (14:51 -0700)]
Merge "Update strings in battery settings." into pi-dev
am:
faa5c2281e
Change-Id: I0196ea02f6e3ca9ff533feae1942540daa35e0c2
TreeHugger Robot [Thu, 10 May 2018 21:28:31 +0000 (21:28 +0000)]
Merge "Update strings in battery settings." into pi-dev
Fan Zhang [Thu, 10 May 2018 20:53:59 +0000 (13:53 -0700)]
Add a new enum to support available/non-searchable settings
Bug:
72748524
Test: existing robotests
Change-Id: I46b2b4a4fa33d8a94de83829cc1eddc99e89b247
Doris Ling [Thu, 10 May 2018 20:32:24 +0000 (13:32 -0700)]
Map the new category keys to the corresponding fragment.
- map category night_light to NightDisplaySettings
- map category gestures to GestureSettings
Bug:
79530682
Bug:
79532703
Test: make RunSettingsRoboTests
Change-Id: Idc45957d2515e148226897f58fcc358a8c7f37dd
rafftsai [Thu, 10 May 2018 03:18:03 +0000 (11:18 +0800)]
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
Merged-In: I8314e3a01907e0befa63b96271bfc2b15c5a1d50
rafftsai [Thu, 10 May 2018 03:18:03 +0000 (11:18 +0800)]
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
Salvador Martinez [Mon, 7 May 2018 20:34:59 +0000 (13:34 -0700)]
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
Lei Yu [Thu, 10 May 2018 20:22:34 +0000 (13:22 -0700)]
Add help uri for smart battery page
Bug:
77299457
Test: Build
Change-Id: I3d0ba355e0ded6f830eddd501f57af601c0b33c7
Lei Yu [Thu, 10 May 2018 20:21:47 +0000 (13:21 -0700)]
Merge "Use user doze whitelist in anomaly detection" into pi-dev
am:
d257c1a2d9
Change-Id: I0d7d66e96395197baed09e012b52be83bb2f4129
Lei Yu [Thu, 10 May 2018 20:10:42 +0000 (20:10 +0000)]
Merge "Use user doze whitelist in anomaly detection" into pi-dev
Lei Yu [Thu, 10 May 2018 18:45:31 +0000 (11:45 -0700)]
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
Meng Wang [Thu, 10 May 2018 19:10:09 +0000 (12:10 -0700)]
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev am:
6fcafbe5bf
am:
ed6037dffa
Change-Id: I163fb4c27334f64362033a94ebaad55387c8da61
Meng Wang [Thu, 10 May 2018 19:07:38 +0000 (12:07 -0700)]
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev
am:
6fcafbe5bf
Change-Id: Iedc26b0440817548fe6a014c5d7454d2f8d8a88b
TreeHugger Robot [Thu, 10 May 2018 18:57:39 +0000 (18:57 +0000)]
Merge "Revert "Remove provisioning dialog from wifi-tethering"" into pi-dev
Fan Zhang [Thu, 10 May 2018 18:32:23 +0000 (11:32 -0700)]
Merge "Fix a typo in AndroidManifest.xml" into pi-dev am:
3a9fbac582
am:
e50f5effa0
Change-Id: I68689c03344b1987b905b32f95f91d82b5a9e129
Lei Yu [Thu, 10 May 2018 18:31:29 +0000 (11:31 -0700)]
Update strings in battery settings.
1. Message in high usage dialog
2. Title in app usage list
Change-Id: Iac610483e10e8d2a93a18ca664aec17d9561aaf8
Fixes:
78638843
Test: RunSettingsRoboTests
Fan Zhang [Thu, 10 May 2018 18:20:24 +0000 (11:20 -0700)]
Merge "Fix a typo in AndroidManifest.xml" into pi-dev
am:
3a9fbac582
Change-Id: Ifa4fef188cdcd80ff997575ed593f67c9bb7fe86
Fan Zhang [Thu, 10 May 2018 18:07:27 +0000 (18:07 +0000)]
Merge "Fix a typo in AndroidManifest.xml" into pi-dev
Lei Yu [Thu, 10 May 2018 02:12:34 +0000 (19:12 -0700)]
Fix a bug in AnomalyDetectionJobService
Even though onStopJob is called, the service may still exist, so
we need to reset the mIsJobCanceled in onStartJob
Also remove the batteryStats since we don't need it anymore.
Change-Id: I6d48efecb750ad4e464569cac426d87014a8db90
Fixes:
77968649
Test: RunSettingsRoboTests
TreeHugger Robot [Thu, 10 May 2018 17:02:15 +0000 (17:02 +0000)]
Merge "Add shorter string for Previously connected device"
Beverly Tai [Thu, 10 May 2018 13:41:00 +0000 (06:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev am:
60a9ed8627
am:
c93a0dc2fb -s ours
Change-Id: If63814774deff6cc157115ddb18bd1eea48432d5
Beverly Tai [Thu, 10 May 2018 13:35:13 +0000 (06:35 -0700)]
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
am:
60a9ed8627
Change-Id: I9a16629067a76f2113c6ed312796aa47dda7f649
Beverly Tai [Thu, 10 May 2018 13:28:47 +0000 (13:28 +0000)]
Merge "DO NOT MERGE Add zen starred contacts preference" into pi-dev
hjchangliao [Thu, 10 May 2018 08:18:33 +0000 (16:18 +0800)]
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
Meng Wang [Thu, 10 May 2018 05:14:41 +0000 (05:14 +0000)]
Revert "Remove provisioning dialog from wifi-tethering"
This reverts commit
81ca3dd4c0bb4c7918cadbb8378f9b96acb5babb.
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
ryanywlin [Thu, 10 May 2018 03:46:27 +0000 (20:46 -0700)]
Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev am:
7e31e22f57
am:
82db752ef0
Change-Id: I7e9a40b08afebedb7b44a6345cda8b2564db315d
ryanywlin [Thu, 10 May 2018 03:41:55 +0000 (20:41 -0700)]
Merge changes from topic "add-hearing-aid-device-in-audio-switch" into pi-dev
am:
7e31e22f57
Change-Id: I118c59326c4403f350201b55b4711cc7bd92243d
TreeHugger Robot [Thu, 10 May 2018 03:31:33 +0000 (03:31 +0000)]
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.
Mehdi Alizadeh [Thu, 10 May 2018 03:13:40 +0000 (20:13 -0700)]
[automerger skipped] Merge changes from topic "swipe-up-gesture-overlay" into pi-dev am:
3167f72961
am:
85833473e1 -s ours
Change-Id: Iee0dd7da6b06856f2ed73fb0ed1efb10d127acc1
Mehdi Alizadeh [Thu, 10 May 2018 03:09:15 +0000 (20:09 -0700)]
Merge changes from topic "swipe-up-gesture-overlay" into pi-dev
am:
3167f72961
Change-Id: Iac284f04b0ba862064ea5d2822819eaf31dcb4c0
Mehdi Alizadeh [Thu, 10 May 2018 03:01:05 +0000 (03:01 +0000)]
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
ryanywlin [Fri, 27 Apr 2018 23:26:46 +0000 (07:26 +0800)]
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
Lei Yu [Thu, 10 May 2018 02:25:25 +0000 (19:25 -0700)]
Merge changes Ifa91ad93,I14f9696a into pi-dev am:
d067cbcfc9
am:
9e639df738
Change-Id: Ic156328bb3249d9c82cc4ea38dc17bc39ddf0d27
Lei Yu [Wed, 9 May 2018 01:06:53 +0000 (18:06 -0700)]
Use user doze whitelist in anomaly detection
Bug:
77924141
Test: RunSettingsRoboTests
Change-Id: Id9503c9468292f128b76ea872d6603c49965d919
ryanywlin [Fri, 27 Apr 2018 08:54:43 +0000 (16:54 +0800)]
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
Lei Yu [Thu, 10 May 2018 02:16:16 +0000 (19:16 -0700)]
Merge changes Ifa91ad93,I14f9696a into pi-dev
am:
d067cbcfc9
Change-Id: Idddf18d56322a274145be20a0c6858fcd6cd78e0
ryanywlin [Fri, 27 Apr 2018 08:46:57 +0000 (16:46 +0800)]
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
Lei Yu [Thu, 10 May 2018 02:06:19 +0000 (02:06 +0000)]
Merge changes Ifa91ad93,I14f9696a into pi-dev
* changes:
Update the BatteryTipPolicy
Update and expose the low battery tip.
Mehdi Alizadeh [Thu, 10 May 2018 01:47:01 +0000 (18:47 -0700)]
Imports com.android.settings.R to fix build breakage
Bug:
78908915
Bug:
78641268
Test: None
Change-Id: Ic98e58188bba211ab9e16b8915012f6ac49280ea
Merged-In: I01dc37a90f132b9052a3ecae04d4ea09a0c78c91
Mehdi Alizadeh [Fri, 4 May 2018 18:42:46 +0000 (11:42 -0700)]
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
Fan Zhang [Thu, 10 May 2018 00:33:19 +0000 (17:33 -0700)]
Fix a typo in AndroidManifest.xml
And some drive-by clean up.
Change-Id: Ic036f8f5bec8064a5d55e0e032ce45e483323b14
Fixes:
78889604
Test: atest
Salvador Martinez [Wed, 9 May 2018 23:56:30 +0000 (16:56 -0700)]
Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am:
cda8a44cee
am:
f94119e739
Change-Id: If887d0c414649489d483bf523316d1f960798000
Fan Zhang [Wed, 9 May 2018 23:53:43 +0000 (16:53 -0700)]
Merge "Fix a concurrent modification exception in Slice provider." into pi-dev am:
350c5b3c40
am:
b8b9e69a94
Change-Id: I7827b526be72fb2678d7bb662e6c13f722a8aaa9
Salvador Martinez [Wed, 9 May 2018 23:47:06 +0000 (16:47 -0700)]
Merge "Hide hidden network spinner for non-hidden networks" into pi-dev
am:
cda8a44cee
Change-Id: If55a1837c0a9e9156f11be933ac7676edcbd6af9
Fan Zhang [Wed, 9 May 2018 23:42:36 +0000 (16:42 -0700)]
Merge "Fix a concurrent modification exception in Slice provider." into pi-dev
am:
350c5b3c40
Change-Id: I09d3d0148b58f954cb584b5c5c63059396af8fb1
TreeHugger Robot [Wed, 9 May 2018 23:41:23 +0000 (23:41 +0000)]
Merge "Hide hidden network spinner for non-hidden networks" into pi-dev
TreeHugger Robot [Wed, 9 May 2018 23:28:45 +0000 (23:28 +0000)]
Merge "Fix a concurrent modification exception in Slice provider." into pi-dev
TreeHugger Robot [Wed, 9 May 2018 22:59:39 +0000 (22:59 +0000)]
Merge "Imports com.android.settings.R to fix build breakage in master"
Lei Yu [Wed, 9 May 2018 22:28:38 +0000 (15:28 -0700)]
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev am:
1dbe185db2
am:
1f429286d2
Change-Id: Ia95728a05d7473c6898046141818700c8d52a97e
Lei Yu [Wed, 9 May 2018 22:08:09 +0000 (15:08 -0700)]
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
am:
1dbe185db2
Change-Id: I14a5de9f360b11de52ecda509fcdeca11d1af0a2
Mehdi Alizadeh [Wed, 9 May 2018 21:56:39 +0000 (14:56 -0700)]
Imports com.android.settings.R to fix build breakage in master
This change should resolve the build failure for ag/
4013709 in master.
Bug:
78908915
Bug:
78641268
Test: None
Change-Id: I01dc37a90f132b9052a3ecae04d4ea09a0c78c91
TreeHugger Robot [Wed, 9 May 2018 21:54:26 +0000 (21:54 +0000)]
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
Andreas Terzis [Wed, 9 May 2018 21:37:35 +0000 (14:37 -0700)]
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev am:
b5de55fbfc
am:
aee672badc
Change-Id: Idaa745faed1e8a9aaaac10ecb255374caa624f65
Matthew Fritze [Wed, 9 May 2018 21:35:52 +0000 (14:35 -0700)]
[automerger skipped] Merge "Establish permanently unavailable settings" into pi-dev am:
ab68a8107c
am:
57c000113f -s ours
Change-Id: I2f4b619271e987fc42991458b677307303e414f7
Andreas Terzis [Wed, 9 May 2018 21:31:06 +0000 (14:31 -0700)]
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
am:
b5de55fbfc
Change-Id: Ic31625e5eab080bdb007d85803b2f9eebe430dbf
Matthew Fritze [Wed, 9 May 2018 21:21:22 +0000 (14:21 -0700)]
Merge "Establish permanently unavailable settings" into pi-dev
am:
ab68a8107c
Change-Id: I492624cf4d1fcfba85c0dc6f9042f456ce882ed5
Andreas Terzis [Wed, 9 May 2018 21:15:43 +0000 (21:15 +0000)]
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev