TreeHugger Robot
04af70a604
Merge "Revert "Settings: Add logical camera default switch""
2018-06-04 17:35:57 +00:00
TreeHugger Robot
e763ebcba1
Merge "Add Wifi calling Preference slice and other cleanup"
2018-06-01 22:32:11 +00:00
Naina Nalluri
6b1869351a
Add Wifi calling Preference slice and other cleanup
...
WifiCallingPreference Slice Provider:
1. If Wifi calling is not enabled - display message to user
to enable Wifi calling
2. Else if Wifi preference is not editable - return a null
Slice
3. Else provide a slice with rows - first row giving current pref
information, followed by preference items (in each row).
wifi_only is displayed only when it is allowed to display it.
Each row with preference item has specific intent action.
WifiCallingPreference Slice BroadcastReceiver:
1. If only Wifi calling is enabled & Wifi preference is editable &
there is a change in current value modify wifi pref setting
2. And Ask to re-query the slice in one second to display
updated settings if 1 is valid or display appropriate message.
Clean-up:
1. Return null instead of non-actionable slices.
2. Use getText to get string resources.
3. Remove unnecessary extra variables.
Bug: 79548264
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I186f19be2007c2331eaf6195e70b4a9c635adf9e
2018-06-01 11:02:59 -07:00
Beverly
23ea118788
Increase char limit to 76 for Settings string
...
Test: n/a
Change-Id: I97ac988fc85e8e7cbde516d9d8ad2dc86dee7e80
Fixes: 80200230
2018-06-01 10:14:15 -04:00
Bill Yi
cd69e1f808
Import translations. DO NOT MERGE
...
Change-Id: I01a0990e89de81507a540cbaa6b1bd1b2de3b2f9
Auto-generated-cl: translation import
2018-05-31 21:25:44 -07:00
Beverly
dc0c9a0ab9
Merge "No need for "and" - ListFormatter adds it" into pi-dev am: fa01fcb2c9
...
am: 60d57976bc
2018-05-31 16:03:12 -07:00
Shuzhen Wang
6cd426482e
Revert "Settings: Add logical camera default switch"
...
This reverts commit 5aab8d9ee1
2018-05-31 22:29:29 +00:00
TreeHugger Robot
2760369d4f
Merge "Added keyword 'bug' to Send Device Feedback"
2018-05-31 21:35:15 +00:00
Beverly
60d57976bc
Merge "No need for "and" - ListFormatter adds it" into pi-dev
...
am: fa01fcb2c9
2018-05-31 14:24:11 -07:00
Beverly
ab5a016e26
No need for "and" - ListFormatter adds it
...
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
2018-05-31 09:32:26 -04:00
TreeHugger Robot
e68598380e
Merge "Shown toast when BT turned on"
2018-05-31 07:00:27 +00:00
hughchen
3051845840
Shown toast when BT turned on
...
* Shown "Bluetooth turned on" toast only when BT turned on in "Pair new device"
* Add test to verify shown toast function can be called when BT turned on.
Bug: 79383997
Test: make -j42 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDetailTest
Change-Id: I25f75aaa04063d9ef8a0df4bb06aeaa70d7ac146
2018-05-31 11:03:37 +08:00
TreeHugger Robot
d3fede04a8
Merge "Add strings for multiple user footer"
2018-05-30 23:53:34 +00:00
Fan Zhang
fb6f95fb99
Add strings for multiple user footer
...
Bug: 72319180
Test: rebuild
Change-Id: If12ff75555aa362c8663dc19ca6ba4d99a7c8a47
2018-05-30 15:38:26 -07:00
TreeHugger Robot
ae20b1ef0c
Merge "Added new keywords to adaptive brightness results."
2018-05-30 22:35:38 +00:00
Michael
6097fe9c3e
Added new keywords to adaptive brightness results.
...
Added two new strings to the string resource. Added smart brightness and
dyanmic brightness.
Fixes: 80481385
Test: UI change
Change-Id: Iafde3501d41cac13d5f6da16e4575518c8e7ffa9
2018-05-30 14:26:40 -07:00
Andre Garivay
81bb3cfbf4
Added keyword 'bug' to Send Device Feedback
...
Added string resource for keywords
Change-Id: I174a401bab93672a2260cf342c6bf52c311383d3
Fixes: 80419062
Test: UI change
2018-05-30 14:26:16 -07:00
TreeHugger Robot
ad90960b6e
Merge "delete DeviceInfoSettings and activity, pref xml"
2018-05-30 20:14:50 +00:00
TreeHugger Robot
3a05544d34
Merge "Misc fixes for Settings"
2018-05-30 00:26:48 +00:00
Fan Zhang
8379a09554
Misc fixes for Settings
...
- Add some precautious logging in RoundedHomepageIcon in case b/79841665
comes back.
- Hide memory setting from app info page.
Change-Id: I37d090504ab25854e1278aa3a6d3e85781f394b1
Fixes: 79841665
Fixes: 80140797
Test: visual
2018-05-29 13:56:43 -07:00
Antony Sargent
1ee0e670b0
Merge "Another refresh of swipe up gesture video" into pi-dev am: d87ce094cd
...
am: 8155cbc0d2
2018-05-29 12:50:32 -07:00
Antony Sargent
8155cbc0d2
Merge "Another refresh of swipe up gesture video" into pi-dev
...
am: d87ce094cd
2018-05-29 12:04:21 -07:00
TreeHugger Robot
d87ce094cd
Merge "Another refresh of swipe up gesture video" into pi-dev
2018-05-29 18:34:23 +00:00
TreeHugger Robot
cb4faa37e9
Merge "Modified the ManageDomainUrls"
2018-05-29 17:34:41 +00:00
hjchangliao
51ea41a541
Update Android Beam screen layout
...
Use preference footer layout to replace
the old layout android_beam.
Change-Id: I878333ecc001631020706cb02edde48496859dcb
Fixes: 80085332
Test: Manual test
2018-05-28 11:27:26 +08:00
Michael Wright
1c7ae169ac
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev am: 8c60fc69b7
...
am: 23460d03bc
2018-05-25 19:17:33 -07:00
Michael Wright
23460d03bc
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
...
am: 8c60fc69b7
2018-05-25 19:12:31 -07:00
TreeHugger Robot
8c60fc69b7
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
2018-05-26 02:03:09 +00:00
stanley.tf_wang
828409a79d
Modified the ManageDomainUrls
...
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
atest UniquePreferenceTest
atest SettingsGatewayTest
Change-Id: Ib5b1281be6cb3cab8528d10b6d6ff3146f33b8df
2018-05-25 16:16:21 -07:00
Michael Wright
3dbaac6e71
Hide haptic intensity settings for devices without enough dynamic range.
...
Despite our hope, devices prior to P18 just don't have the dynamic range
to give three distinct vibration intensity settings. Given this, only
show an on / off toggle for devices by default unless they explicitly
opt-in to multiple intensity levels.
Test: m -j RunSettingsRoboTests
Bug: 80243632
Change-Id: I14ece855cf20f9fa44b0648d28f89c0053be5c5f
2018-05-25 22:57:03 +01:00
Antony Sargent
e07b961cee
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev am: e4999751ab
...
am: 5d5eb8bdaa
2018-05-25 14:54:24 -07:00
Antony Sargent
5d5eb8bdaa
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
...
am: e4999751ab
2018-05-25 14:42:14 -07:00
TreeHugger Robot
e4999751ab
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
2018-05-25 21:35:23 +00:00
Antony Sargent
24283d3076
Remove Advanced dropdown from "About phone" screen
...
All the items will appear in the list instead of hiding some under an Advanced
dropdown.
Bug: 80302533
Test: manual (Settings->System->About phone)
Change-Id: I82857ec8e027b00762c1191d9450d30dfe47016f
2018-05-25 13:05:27 -07:00
Antony Sargent
9ba04de58a
Another refresh of swipe up gesture video
...
Bug: 77474484
Test: manual (Settings->System->Gestures->Swipe up on Home button)
Change-Id: I62c46ef38cf67b4bf200ad2420138fe6677d6999
2018-05-25 13:02:26 -07:00
Matthew Fritze
b9d07718d5
Merge "Add remaining whitelisted controllers" into pi-dev
...
am: da07a66365
2018-05-25 10:02:14 -07:00
TreeHugger Robot
da07a66365
Merge "Add remaining whitelisted controllers" into pi-dev
2018-05-25 16:53:44 +00:00
TreeHugger Robot
fdef0464e9
Merge "Add remaining whitelisted controllers"
2018-05-25 16:47:57 +00:00
Fan Zhang
a8c2602987
Merge "Update storage header background to colorPrimary" into pi-dev
...
am: 5431191163
2018-05-25 08:59:26 -07:00
Fan Zhang
5431191163
Merge "Update storage header background to colorPrimary" into pi-dev
2018-05-25 15:49:59 +00:00
Antony Sargent
97e418f45c
Merge "Update sound settings icons" into pi-dev am: 2e0709b3b8
...
am: 75ffd61ee3
2018-05-24 23:50:12 -07:00
Antony Sargent
493847ea8e
Merge "Refresh several icons" into pi-dev am: 642e63c2e0
...
am: ef75735861
2018-05-24 23:49:40 -07:00
Antony Sargent
0cb786e81c
Merge "Refresh system update icon" into pi-dev am: efc2cb0492
...
am: 30c39c273c
2018-05-24 23:49:07 -07:00
Lei Yu
3a9bad927e
Merge "Update icon for battery saver conditon." into pi-dev am: 89e0287711
...
am: 4c39b05ad7
2018-05-24 23:48:36 -07:00
Antony Sargent
3e85b13253
Merge "Refresh battery status icons" into pi-dev am: 64379a08f7
...
am: bc375150de
2018-05-24 23:47:23 -07:00
Antony Sargent
ef5a3eeade
Merge "Updated misc. settings icon" into pi-dev am: c3d2e78d82
...
am: 7e62c0bffa
2018-05-24 23:46:36 -07:00
Chihhang Chuang
6c1c1a6a50
Merge "Refactor nfc preference controller" into pi-dev
...
am: 2357c1cd84
2018-05-24 16:35:26 -07:00
Antony Sargent
75ffd61ee3
Merge "Update sound settings icons" into pi-dev
...
am: 2e0709b3b8
2018-05-24 16:31:15 -07:00
Antony Sargent
ef75735861
Merge "Refresh several icons" into pi-dev
...
am: 642e63c2e0
2018-05-24 16:18:05 -07:00
Antony Sargent
30c39c273c
Merge "Refresh system update icon" into pi-dev
...
am: efc2cb0492
2018-05-24 16:06:22 -07:00
