OSDN Git Service
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
Fan Zhang [Thu, 10 May 2018 22:14:06 +0000 (22:14 +0000)]
Merge "Remove search option in Magnification settings"
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
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
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
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
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
TreeHugger Robot [Wed, 9 May 2018 21:13:44 +0000 (21:13 +0000)]
Merge "Establish permanently unavailable settings" into pi-dev
Salvador Martinez [Wed, 9 May 2018 20:45:05 +0000 (13:45 -0700)]
Merge "Remove the Settings search keywords from Slices" into pi-dev am:
26453818b9
am:
7e34ffdb6a
Change-Id: Ib4abbf9c4b4db45ab99846b7377ecaea4c0e9745
Salvador Martinez [Wed, 9 May 2018 20:41:03 +0000 (13:41 -0700)]
Merge "Remove the Settings search keywords from Slices" into pi-dev
am:
26453818b9
Change-Id: I9dbc077c72a0ca4b29364f7eea39d3e4f82f1fdb
Salvador Martinez [Wed, 9 May 2018 20:30:02 +0000 (20:30 +0000)]
Merge "Remove the Settings search keywords from Slices" into pi-dev
android-build-team Robot [Wed, 9 May 2018 20:25:37 +0000 (13:25 -0700)]
[automerger skipped] Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev am:
9110d29f13
am:
8d504b4d98 -s ours
Change-Id: I265784b7b4e0236f73db72a7984ddb4116d4de57
Beverly [Wed, 9 May 2018 19:28:21 +0000 (15:28 -0400)]
DO NOT MERGE Add zen starred contacts preference
Bug:
78447976
Test: ZenModeStarredContactsPreferenceControllerTest
Change-Id: Ic9d1b08c3e80832b29ad8e223a34f35e2f763cf9
android-build-team Robot [Wed, 9 May 2018 20:03:38 +0000 (13:03 -0700)]
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
am:
9110d29f13
Change-Id: Ib6ff8cf2cfde3ee12bdb757b4a691b90ba02c398
Fan Zhang [Wed, 9 May 2018 19:51:20 +0000 (12:51 -0700)]
Fix a concurrent modification exception in Slice provider.
Change-Id: I87449dda9a56b5e8932dc4c6bec462195cb89348
Fixes:
79372493
Test: monkey
android-build-team Robot [Wed, 9 May 2018 19:47:02 +0000 (19:47 +0000)]
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
android-build-team Robot [Wed, 9 May 2018 19:41:47 +0000 (12:41 -0700)]
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev am:
27f1e8e1e9
am:
5dc5fbc0d5
Change-Id: Idabb5bcca09b7617334133615e92bfce59281c18
Lei Yu [Fri, 20 Apr 2018 22:43:45 +0000 (15:43 -0700)]
Update the BatteryTipPolicy
1. Add "testLowBatteryTip"
2. Update default value for low battery threshold
Change-Id: Ifa91ad93f484dc806dfc176ad5ffd912824f5063
Bug:
76113067
Test: RunSettingsRoboTests
Lei Yu [Fri, 20 Apr 2018 21:58:05 +0000 (14:58 -0700)]
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
Andreas Terzis [Wed, 9 May 2018 05:46:03 +0000 (22:46 -0700)]
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
android-build-team Robot [Wed, 9 May 2018 19:09:08 +0000 (19:09 +0000)]
Merge "Show Option of "Screen lock options" on SUW pattern screen page"
Beverly [Tue, 8 May 2018 14:41:25 +0000 (10:41 -0400)]
DO NOT MERGE Clear deprecated effects when saving zen policy
- Deprecated effects are set in NotificationManagerService,
so unset them before setting the NotificationPolicy
- When user clicks on Custom, they are brought to the custom vis effects
page instead of resetting custom values to presets
Fixes:
79383781
Test: manual
Test: NotificationManagerServiceTest testSetNotificationPolicy_preP_setOldNewFields
Change-Id: Id6db9ce2aaeed6321389f8dbfbea65eda30c74ad
android-build-team Robot [Wed, 9 May 2018 18:19:36 +0000 (11:19 -0700)]
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
am:
27f1e8e1e9
Change-Id: I2457fb1ae8cf8c63d71429c873d6f2b4ef52860f
android-build-team Robot [Wed, 9 May 2018 18:14:32 +0000 (18:14 +0000)]
Merge "Establish permanently unavailable settings"
android-build-team Robot [Wed, 9 May 2018 18:01:10 +0000 (18:01 +0000)]
Merge "Rename SubSettingLauncher.setTitle, add java doc"
android-build-team Robot [Wed, 9 May 2018 17:54:30 +0000 (17:54 +0000)]
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
Lei Yu [Tue, 8 May 2018 22:30:17 +0000 (15:30 -0700)]
Use WRAP_CONTENT for battery saver button
Change-Id: Id1d417021eff56c3733f6711f121085ad67ae3da
Fixes:
79256447
Test: Screenshot
Matthew Fritze [Thu, 3 May 2018 23:46:51 +0000 (16:46 -0700)]
Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.
The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.
Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.
Bug:
78910582
Fixes:
79245656
Test: robotests
Change-Id: I42c2cedab66be2d76999795f46470a079cc1ec71
Merged-In: I58821a6cfd6134b3b351657b6edf5f74ead00643
Matthew Fritze [Tue, 8 May 2018 23:34:36 +0000 (16:34 -0700)]
Remove the Settings search keywords from Slices
The keywords used for settings search are good when we are highly
confident the user is searching for as setting (settings search),
but not effective in a more general search setting (launcher,
an assistant). Thus, we should not index these keywords as Slice
keywords, and rely on the setting title and screen title as baseline
keywords.
Change-Id: I99e44834454b5949c4883f877e02be47498e06e2
Fixes:
78911847
Test: robotests
Matthew Fritze [Thu, 3 May 2018 23:46:51 +0000 (16:46 -0700)]
Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.
The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.
Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.
Bug:
78910582
Bug:
79245656
Test: robotests
Change-Id: I58821a6cfd6134b3b351657b6edf5f74ead00643
android-build-team Robot [Wed, 9 May 2018 15:28:33 +0000 (15:28 +0000)]
Merge "Change references to old loadSafeLabel method"
android-build-team Robot [Wed, 9 May 2018 04:09:12 +0000 (21:09 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
9a1d318b37 -s ours
am:
09df358bd8 -s ours
Change-Id: Iaa228298b45bc1686cc07faa22c65e0062d8d25d
android-build-team Robot [Wed, 9 May 2018 04:04:42 +0000 (21:04 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9a1d318b37 -s ours
Change-Id: Ie5f9d8b1e7883d2e523a8481616bcb24c3dd9b40
android-build-team Robot [Wed, 9 May 2018 03:56:40 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Wed, 9 May 2018 03:56:36 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Hugh Chen [Wed, 9 May 2018 03:14:16 +0000 (20:14 -0700)]
[automerger skipped] Merge "Change the title when in call/media state" into pi-dev am:
32adc82c8a
am:
44526c44ca -s ours
Change-Id: I464549ce35281bcb57e15fddacf2d21ee83b1d66
Hugh Chen [Wed, 9 May 2018 03:09:49 +0000 (20:09 -0700)]
Merge "Change the title when in call/media state" into pi-dev
am:
32adc82c8a
Change-Id: I9f066891464c55fb88ddd95b4f669c3f4e82ebbd
Hugh Chen [Wed, 9 May 2018 03:06:04 +0000 (03:06 +0000)]
Merge "Change the title when in call/media state" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:51:43 +0000 (19:51 -0700)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am:
f4dd526f70
am:
3f40c15294
Change-Id: I169db327d5e07732e45164510244f320787339b0
android-build-team Robot [Wed, 9 May 2018 02:46:35 +0000 (19:46 -0700)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am:
f4dd526f70
Change-Id: Iac7db28e7b22f49280e09974a73310061fb01afd
android-build-team Robot [Wed, 9 May 2018 02:36:26 +0000 (02:36 +0000)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:32:29 +0000 (19:32 -0700)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev am:
69fce6df71
am:
46dd838e8d
Change-Id: I2048cd12599e9d2ad115f2e6b1a6371feb2e72ae
android-build-team Robot [Wed, 9 May 2018 02:28:29 +0000 (19:28 -0700)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
am:
69fce6df71
Change-Id: I9a7e5a5531a81513fb7a0721d04a419cfe957295
android-build-team Robot [Wed, 9 May 2018 02:23:39 +0000 (19:23 -0700)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev am:
af7d41978c
am:
94907ce4c7
Change-Id: Ieb165e0f0be927f92846bbbce3328576d8a4a1e5
android-build-team Robot [Wed, 9 May 2018 02:22:17 +0000 (02:22 +0000)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:15:41 +0000 (19:15 -0700)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev
am:
af7d41978c
Change-Id: Iff2cc5c284add3017d307ced73b71fe101f13ecc
hughchen [Tue, 17 Apr 2018 08:36:58 +0000 (16:36 +0800)]
Change the title when in call/media state
* Change the title when in call/media state.
Example: call state show "Available call devices"
media state show "Available media devices"
* Use isAudioModeOngoingCall() utility function for checking if it is in call status
* Add register test to verify when in onStart() and onStop()
the BluetoothCallback can be register and unregister.
* Add title string test to verify when in call or media state,
the title can be changed to corresponding string
Bug:
78150641
Test: make -j40 RunSettingsRoboTests
Change-Id: I6be72cf0cae75525084ac3c5be8524c709f51f7d
Merged-In: I6be72cf0cae75525084ac3c5be8524c709f51f7d
android-build-team Robot [Wed, 9 May 2018 02:03:03 +0000 (02:03 +0000)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev
hjchangliao [Wed, 2 May 2018 05:01:07 +0000 (13:01 +0800)]
Rename SubSettingLauncher.setTitle, add java doc
For make this method usage more clear,
setTitle(charSequence) rename as setTitleText,
add java doc: it is only for user generated string
setTitle(int) rename as setTitleRes.
Change-Id: I972cb6a8ff90873dfdc25c23f6dc3d68103c8e4e
Fixes:
78347436
Test: make RunSettingsRoboTests
Hugh Chen [Wed, 9 May 2018 01:43:53 +0000 (01:43 +0000)]
Merge "Change the title when in call/media state"
android-build-team Robot [Wed, 9 May 2018 00:57:04 +0000 (17:57 -0700)]
Merge "Update strings for summary tip." into pi-dev am:
0e7cff80ef
am:
171ec14458
Change-Id: I564c2f2099bfba4ba9a8327d7b426365bb4f7bd9
android-build-team Robot [Wed, 9 May 2018 00:53:01 +0000 (17:53 -0700)]
Merge "Update strings for summary tip." into pi-dev
am:
0e7cff80ef
Change-Id: I4c891ea16e4fed831998cf609a5d5d2418528856
Doris Ling [Wed, 9 May 2018 00:48:31 +0000 (17:48 -0700)]
Merge "Update arrow icon for see all apps." into pi-dev am:
6bc31d343e
am:
2f2d676897
Change-Id: Ibd0dd41ba169c057cc0af2357018d55e06d03bc9
android-build-team Robot [Wed, 9 May 2018 00:44:18 +0000 (00:44 +0000)]
Merge "Update strings for summary tip." into pi-dev
Doris Ling [Wed, 9 May 2018 00:39:13 +0000 (17:39 -0700)]
Merge "Update arrow icon for see all apps." into pi-dev
am:
6bc31d343e
Change-Id: I56e43f5fc4d4647aaa695bc071141fe7dcb80107
Doris Ling [Wed, 9 May 2018 00:30:59 +0000 (00:30 +0000)]
Merge "Update arrow icon for see all apps." into pi-dev
Fan Zhang [Tue, 8 May 2018 23:29:39 +0000 (16:29 -0700)]
Stop logging tether password in logcat & metrics provider
Change-Id: I7aaaf3148445bfb6c556ab37c6577da67dc94cbb
Fixes:
79419591
Test: adb logcat -b events | egrep "(sysui_|notification_)"
Lei Yu [Tue, 8 May 2018 23:26:35 +0000 (16:26 -0700)]
Don't check battery usage in excessive bg anomaly
We don't need it anymore because we don't auto restrict this
anomaly.
Bug:
79210436
Test: robo test still pass
Change-Id: I186213a57f9bf54a0e19985f2c92169c6dc0571c
android-build-team Robot [Tue, 8 May 2018 23:27:38 +0000 (16:27 -0700)]
Merge "Add back up message id for "Action not allowed"." into pi-dev am:
c0edff7ffd
am:
4b118a3788
Change-Id: I29355e24dad7179c5cf430e860f6176cddcf42df
Lei Yu [Tue, 8 May 2018 23:22:19 +0000 (16:22 -0700)]
[automerger skipped] Merge "Fix crash in anomaly job service" into pi-dev am:
db5c1cef71
am:
d932e04ccd -s ours
Change-Id: Ia949a5dcd8fb506672705042bda7f96a47cc2499
android-build-team Robot [Tue, 8 May 2018 23:10:34 +0000 (16:10 -0700)]
Merge "Add back up message id for "Action not allowed"." into pi-dev
am:
c0edff7ffd
Change-Id: I4bfd6e2439ceafb5ed4567c6ead21c7ba8ead5e9