Jason Hsu
d8e3fbc5f7
Merge "Accessibility shortcut secondary action - Settings view status link with checkbox"
2020-01-14 04:30:10 +00:00
Betty Chang
d60c780c0d
Merge "[Mainline] Use SmsManager method instead of ISms"
2020-01-14 03:51:34 +00:00
Jason Hsu
fd17fcbf11
Merge "Accessibility shortcut secondary action - Invisible type fragment need to handle AccessibilityServiceState"
2020-01-14 02:46:46 +00:00
Automerger Merge Worker
1d896d97de
[automerger skipped] Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev am: fb44d744c3
am: eff77d28b9
-s ours
...
am skip reason: Change-Id I248654c822284473b8a8265de4a3938af89cdf7a with SHA-1 7f5986b78a
is in history
Change-Id: Icde9da69d902fecbdc5bdf6ce826b2c0ac99261a
2020-01-14 01:00:30 +00:00
Automerger Merge Worker
eff77d28b9
Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev am: fb44d744c3
...
Change-Id: I1716dc3e0b13a430ed4d5ff525b95bb09eb0b90a
2020-01-14 00:49:32 +00:00
TreeHugger Robot
fb44d744c3
Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev
2020-01-14 00:38:29 +00:00
TreeHugger Robot
3225b3255d
Merge "Import translations. DO NOT MERGE"
2020-01-14 00:14:48 +00:00
Automerger Merge Worker
8f4b84075a
[automerger skipped] Import translations. DO NOT MERGE am: 1389dcfd02
-s ours am: fc8e7f17e1
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id7c539e18d0049368bf731fe26bfe9ffaacf586e
2020-01-13 23:15:00 +00:00
Automerger Merge Worker
fc8e7f17e1
[automerger skipped] Import translations. DO NOT MERGE am: 1389dcfd02
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie2ea7d30997627c72db58fc36ff0ad53664d6c27
2020-01-13 23:03:13 +00:00
Bill Yi
05c8bccf61
Import translations. DO NOT MERGE
...
Change-Id: I9289b815a4ae222ce411f24a3632dd513c06f5ef
Auto-generated-cl: translation import
2020-01-13 14:40:13 -08:00
Bill Yi
1389dcfd02
Import translations. DO NOT MERGE
...
Change-Id: Ic9b96f52ac79db1805be44d0272709c417c68801
Auto-generated-cl: translation import
2020-01-13 14:00:18 -08:00
Raff Tsai
cce1a5a1f2
Fix test cases error
...
Fixes: 147563810
Change-Id: I500f9897c1f8a0e3bdddad15b5f8377d9bb9ded3
Test: robolectric
2020-01-13 22:57:42 +08:00
Automerger Merge Worker
65b29905f7
[automerger skipped] Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences" am: 9c79dfb493
am: 658444b986
am: c631bf2ef0
-s ours
...
am skip reason: Change-Id Ic5711309c5b8af9834e5439d825b4cb2ed55fe01 with SHA-1 8416d8efd7
is in history
Change-Id: I2e6237a3f5dc4623e2c3a26ed3b96aa75bbcbadf
2020-01-13 08:32:05 +00:00
Automerger Merge Worker
c631bf2ef0
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences" am: 9c79dfb493
am: 658444b986
...
Change-Id: I969cf4b26db7c36917bb4b8741db8ad5833c8d7c
2020-01-13 08:20:54 +00:00
changbetty
04a3ef6e67
[Mainline] Use SmsManager method instead of ISms
...
Bug: 146808981
Test: make
Change-Id: I388f9e9979ce9d83d7e3daf510c9dcb3303cc5c7
2020-01-13 16:15:03 +08:00
Kevin Chang
658444b986
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"
...
am: 9c79dfb493
Change-Id: I709b7be56b5192faf0466098e91911ed655ccb17
2020-01-13 00:06:28 -08:00
Kevin Chang
9c79dfb493
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"
2020-01-13 07:44:18 +00:00
jasonwshsu
5469cffa58
Accessibility shortcut secondary action - Invisible type fragment need to handle AccessibilityServiceState
...
- InvisibleToggleAccessibilityServicePreferenceFragment need to set
AccessibilityServiceState according to ShortcutPreference checkbox's stauts.
Bug: 142530063
Test: manual
Change-Id: I9ff21b66ebf72a51e62a958e3e391624c7925c27
2020-01-13 15:22:50 +08:00
jasonwshsu
5fd157b404
Accessibility shortcut secondary action - Settings view status link with checkbox
...
Lets settings view auto enabled by checkbox click status.
Bug: 142530063
Test: make -j52 RunSettingsRoboTests ROBOTEST_FILTER=ShortcutPreferenceTest
Change-Id: I588d2ada85ae1169f439db9c6ce254c20119b2e5
2020-01-13 15:05:47 +08:00
Menghan Li
7ad9008ce9
Merge "Support accessibility shortcut secondary action (7/n)"
2020-01-13 06:13:10 +00:00
Raff Tsai
687b8c4b11
Merge "Fix layout issues"
2020-01-13 05:11:29 +00:00
menghanli
334dc4f20b
Support accessibility shortcut secondary action (7/n)
...
Implements sharedPreference to keep the user preferred shortcut for each
service.
Bug: 142530063
Bug: 142531156
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleFeaturePreferenceFragmentTest
Test: make RunSettingsRoboTests2
Change-Id: I2a7c54ddc32764f6d88f2efed87982d469acc183
2020-01-13 12:34:04 +08:00
Jean Chen
4ae8991222
Merge "Support caption second UI structure (3/n)"
2020-01-13 02:24:01 +00:00
Kevin Chang
01357b5b73
Modify the code logic of OnLayoutChangeListener in Caption preferences
...
Remove the listener and add statement to refresh the text when the caption turns on.
Bug: 142632389
Test: Manual
Change-Id: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
Merged-In: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
2020-01-13 10:10:36 +08:00
Kevin Chang
ca149c7d04
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"
2020-01-13 02:00:14 +00:00
TreeHugger Robot
82872cb253
Merge "Fix work tab app doesn't launch correct user intent"
2020-01-13 01:55:56 +00:00
Raff Tsai
41435ad0ea
Fix layout issues
...
- Add fontFamily in TextAppearance.Tab to support change font style
- Overwrite TabTheme to change overscroll effect color
Fixes: 147134904
Fixes: 147136108
Test: manual
Change-Id: Iebb2dea658a295f3c6ece900680f42fb3a772cb4
2020-01-13 03:07:00 +08:00
TreeHugger Robot
b642f3cb10
Merge "Visual updates for DND screens"
2020-01-11 20:09:26 +00:00
Automerger Merge Worker
29a464db2c
[automerger skipped] Import translations. DO NOT MERGE am: 5680c7b0e4
-s ours am: 0e5c9124f0
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I286029eaa7c5427a73c5074d80e87a4f416cfb24
2020-01-11 19:48:54 +00:00
Automerger Merge Worker
0e5c9124f0
[automerger skipped] Import translations. DO NOT MERGE am: 5680c7b0e4
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0990e22af9fca905e34d8afa5dc978f3d5f11af1
2020-01-11 19:34:44 +00:00
Julia Reynolds
b5ea53a981
Visual updates for DND screens
...
(part 1), emphasizing People
Test: atest, manual
Bug: 137397357
Change-Id: I5672462feb480ea2fced70470ed7c2c8116fadfd
2020-01-11 17:03:22 +00:00
Bill Yi
5680c7b0e4
Import translations. DO NOT MERGE
...
Change-Id: I2ef156b791ffe0cd24dcdb6501cf18dc07625d50
Auto-generated-cl: translation import
2020-01-11 06:40:09 -08:00
Tom Hsu
452bc35d9c
Merge "Remove reference of PhoneConstant."
2020-01-11 09:39:50 +00:00
Curtis Belmonte
03390a5682
Merge "Update L2U string for face unlock in settings"
2020-01-11 01:53:17 +00:00
Raff Tsai
4536fae5b7
Fix work tab app doesn't launch correct user intent
...
- Pass user.getIndentifier() to intent
Fixes: 147357696
Test: 1. go to Settings -> Storage -> Music&Audio
2. switch to work tab
3. tab "Audio files"
4. should display work profile files
Change-Id: I0d2883c45eb7b883adbaf034c0a49c5e52ba82f6
2020-01-11 09:16:24 +08:00
Sarah Chin
4520826af6
[automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22ff
am: dd1c7d0a8a
-s ours
...
am: 875ac6925a
-s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 9ea18281ee
is in history
Change-Id: I88005f5f4d077db75f95d495be3c0b781cfa066f
2020-01-10 11:26:36 -08:00
Sarah Chin
e043681c41
[automerger skipped] Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp
...
am: c21d0ca119
-s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 9ea18281ee
is in history
Change-Id: I51e4aff47437458ad69127cb0b1d382a7d6a684f
2020-01-10 11:26:08 -08:00
Sarah Chin
a8e8b776ad
[automerger skipped] 5G meteredness for telephony framework
...
am: 9ea18281ee
-s ours
am skip reason: change_id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA1 0c518d5aab
is in history
Change-Id: Iec2190074e247f441a2bbc4f3baabca54d927764
2020-01-10 11:17:39 -08:00
David Su
8aeb6ce749
Merge "SettingsRoboTests: Remove @hide Wifi API usages"
2020-01-10 19:11:45 +00:00
TreeHugger Robot
01a55e950d
Merge "mainline: remove CarrierConfigManager.init"
2020-01-10 18:48:20 +00:00
tom hsu
25f1de88dd
Remove reference of PhoneConstant.
...
Copy constants to ApnEditor from PhoneConstant
Test: make
Test: m RunSettingsRoboTests
Change-Id: I22b85799ad547aca1ce4e63af3f39bc7f29618c6
2020-01-10 17:30:18 +00:00
Automerger Merge Worker
875ac6925a
[automerger skipped] Merge "5G meteredness for telephony framework" am: 5ce99e22ff
am: dd1c7d0a8a
-s ours
...
am skip reason: Change-Id I0c8e84f74fd1f69ffc7e1046819966fcb04732a6 with SHA-1 9ea18281ee
is in history
Change-Id: I9b54d37c262a0b25a044daa3372432793595c15a
2020-01-10 17:18:30 +00:00
Sarah Chin
dd1c7d0a8a
Merge "5G meteredness for telephony framework"
...
am: 5ce99e22ff
Change-Id: I5f516f7ba5b4e0ec24283c4b555d4a5ff9ae2ea6
2020-01-10 09:03:56 -08:00
Sarah Chin
5ce99e22ff
Merge "5G meteredness for telephony framework"
2020-01-10 16:36:48 +00:00
Sarah Chin
c21d0ca119
Merge "5G meteredness for telephony framework" into qt-qpr1-dev-plus-aosp
2020-01-10 16:32:40 +00:00
SongFerngWang
762e193266
mainline: remove CarrierConfigManager.init
...
Bug: 147469789
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Change-Id: I2a72d409574fc281e5de57d58a27551dd040d551
2020-01-10 23:12:30 +08:00
Lee Chou
e9a38a37ba
Merge "Replaced reference to setPreferredNetworkType"
2020-01-10 14:50:47 +00:00
TreeHugger Robot
424a2595a7
Merge "Removed reference to PhoneConstant PHONE_TYPE_*"
2020-01-10 13:52:32 +00:00
TreeHugger Robot
581c663275
Merge "Update Dark theme slice for new behavior"
2020-01-10 13:44:19 +00:00
Sunny Shao
31c5f39d57
Update Dark theme slice for new behavior
...
- Add an broadcast receiver to monitor the Home key.
- Add the sClickedInSlice flag to verify Dark theme is changed by slice or not.
Bug: 142476879
Fixes: 146149658
Fixes: 146652692
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: I174d0c861ea3b3f793201e3b2e0ff65a1e690f4e
2020-01-10 20:12:38 +08:00