Salvador Martinez
7e4f8a28eb
Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am: cda8a44cee
...
am: f94119e739
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
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
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
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
2018-05-09 15:28:38 -07:00
Lei Yu
1f429286d2
Merge "Use WRAP_CONTENT for battery saver button" into pi-dev
...
am: 1dbe185db2
2018-05-09 15:08:09 -07:00
Mehdi Alizadeh
d5f74a21c9
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
2018-05-09 14:56:39 -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
72e5c02bf1
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev am: b5de55fbfc
...
am: aee672badc
2018-05-09 14:37:35 -07:00
Matthew Fritze
5e14f5afc9
[automerger skipped] Merge "Establish permanently unavailable settings" into pi-dev am: ab68a8107c
...
am: 57c000113f
2018-05-09 14:35:52 -07:00
Andreas Terzis
aee672badc
Merge "Increase the char limit of carrier_and_update_text to 32." into pi-dev
...
am: b5de55fbfc
2018-05-09 14:31:06 -07:00
Matthew Fritze
57c000113f
Merge "Establish permanently unavailable settings" into pi-dev
...
am: ab68a8107c
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
bfcedc54b0
Merge "Remove the Settings search keywords from Slices" into pi-dev am: 26453818b9
...
am: 7e34ffdb6a
2018-05-09 13:45:05 -07:00
Salvador Martinez
7e34ffdb6a
Merge "Remove the Settings search keywords from Slices" into pi-dev
...
am: 26453818b9
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
android-build-team Robot
6a66bae12b
[automerger skipped] Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev am: 9110d29f13
...
am: 8d504b4d98
2018-05-09 13:25:37 -07:00
android-build-team Robot
8d504b4d98
Merge "DO NOT MERGE Clear deprecated effects when saving zen policy" into pi-dev
...
am: 9110d29f13
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
android-build-team Robot
a75d1e41ce
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev am: 27f1e8e1e9
...
am: 5dc5fbc0d5
2018-05-09 12:41:47 -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
android-build-team Robot
579300b00c
Merge "Show Option of "Screen lock options" on SUW pattern screen page"
2018-05-09 19:09:08 +00:00
Beverly
17c6de8e68
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
2018-05-09 18:50:48 +00:00
android-build-team Robot
5dc5fbc0d5
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
...
am: 27f1e8e1e9
2018-05-09 11:19:36 -07:00
android-build-team Robot
02ec86a17b
Merge "Establish permanently unavailable settings"
2018-05-09 18:14:32 +00:00
android-build-team Robot
c0e0262f9c
Merge "Rename SubSettingLauncher.setTitle, add java doc"
2018-05-09 18:01:10 +00:00
android-build-team Robot
27f1e8e1e9
Merge "Don't check battery usage in excessive bg anomaly" into pi-dev
2018-05-09 17:54:30 +00:00
Lei Yu
d0ca222d9a
Use WRAP_CONTENT for battery saver button
...
Change-Id: Id1d417021eff56c3733f6711f121085ad67ae3da
Fixes: 79256447
Test: Screenshot
2018-05-09 10:44:23 -07:00
Matthew Fritze
bd376296cd
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
2018-05-09 10:03:40 -07:00
Matthew Fritze
ff865c898f
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
2018-05-09 09:01:58 -07:00
Matthew Fritze
f87a1f3f41
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
2018-05-09 08:36:59 -07:00
android-build-team Robot
7ce6ba52c5
Merge "Change references to old loadSafeLabel method"
2018-05-09 15:28:33 +00:00
android-build-team Robot
0e79a3a733
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9a1d318b37 -s ours
...
am: 09df358bd8
2018-05-08 21:09:12 -07:00
android-build-team Robot
09df358bd8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 9a1d318b37
2018-05-08 21:04:42 -07:00
android-build-team Robot
b395027f81
Merge "Import translations. DO NOT MERGE"
2018-05-09 03:56:40 +00:00
android-build-team Robot
9a1d318b37
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-05-09 03:56:36 +00:00
Hugh Chen
2a72c197e1
[automerger skipped] Merge "Change the title when in call/media state" into pi-dev am: 32adc82c8a
...
am: 44526c44ca
2018-05-08 20:14:16 -07:00
Hugh Chen
44526c44ca
Merge "Change the title when in call/media state" into pi-dev
...
am: 32adc82c8a
2018-05-08 20:09:49 -07:00
Hugh Chen
32adc82c8a
Merge "Change the title when in call/media state" into pi-dev
2018-05-09 03:06:04 +00:00
android-build-team Robot
11c3af70e1
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am: f4dd526f70
...
am: 3f40c15294
2018-05-08 19:51:43 -07:00
android-build-team Robot
3f40c15294
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
...
am: f4dd526f70
2018-05-08 19:46:35 -07:00
android-build-team Robot
f4dd526f70
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
2018-05-09 02:36:26 +00:00
android-build-team Robot
d284fe11aa
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev am: 69fce6df71
...
am: 46dd838e8d
2018-05-08 19:32:29 -07:00
android-build-team Robot
46dd838e8d
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
...
am: 69fce6df71
2018-05-08 19:28:29 -07:00
android-build-team Robot
37dc457969
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev am: af7d41978c
...
am: 94907ce4c7
2018-05-08 19:23:39 -07:00
