Quang Luong
b470e725c9
Added WifiSettings -> WifiSettings2 redirection behind feature flag
...
Use WifiSettings2 if settings_wifitracker2 feature flag is enabled.
WifiSettings2 will be used for changes to WifiSettings to incorporate
the WifiTracker2 refactor.
Bug: 70983952
Test: make, set feature flag, open Wifi settings to verify new page
opens.
Change-Id: I08edc227bf38ab4b3b785180bf123815bf95da81
2019-07-22 14:41:11 -07:00
TreeHugger Robot
b1625b3158
Merge "Add start margin in the Screen usage item"
2019-07-19 16:40:53 +00:00
Sunny Shao
af68c44ed4
Add start margin in the Screen usage item
...
Avoid the title and subtitle overlap while text length is long. So add the
start margin for subtitle.
Fixes: 136282569
Test: manual test
Change-Id: Id1728ae60904c654c4ffe95fae7fb5139f368092
2019-07-19 06:11:56 +00:00
Antony Sargent
136a0f53f6
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev am: 20ec6a4b6f
...
am: f61428cf1d
2019-07-18 20:06:19 -07:00
Antony Sargent
f61428cf1d
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
...
am: 20ec6a4b6f
2019-07-18 19:57:18 -07:00
TreeHugger Robot
20ec6a4b6f
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
2019-07-19 02:26:19 +00:00
Bill Yi
5d1c65e3e9
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours am: 1f4b32a154 -s ours
...
am: aaae63aaa9
2019-07-18 14:43:38 -07:00
Bill Yi
83a9c6bfb5
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours am: ad2542c534 -s ours
...
am: 160a6efb72
2019-07-18 14:42:41 -07:00
Bill Yi
e7a46a0f2b
[automerger skipped] Import translations. DO NOT MERGE am: 56887f467c -s ours
...
am: f36921c04b
2019-07-18 14:34:18 -07:00
Android Build Merger (Role)
aaae63aaa9
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours am: 1f4b32a154 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-18 21:33:57 +00:00
Bill Yi
7355faeb99
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
...
am: 1f4b32a154
2019-07-18 14:33:35 -07:00
Bill Yi
160a6efb72
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
...
am: ad2542c534
2019-07-18 14:33:33 -07:00
Bill Yi
f36921c04b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 56887f467c
2019-07-18 14:24:36 -07:00
Bill Yi
ad2542c534
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
2019-07-18 14:24:36 -07:00
Bill Yi
1f4b32a154
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
2019-07-18 14:24:35 -07:00
Bill Yi
e73e59c562
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
2019-07-18 11:28:21 -07:00
Bill Yi
56887f467c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id43eff8bedf9c1bd2d3d25a73a560705ab8da213
2019-07-18 11:07:45 -07:00
Raff Tsai
738a233f0c
Merge "Fix Disabled text color in dark theme"
2019-07-18 11:02:02 +00:00
Kevin Chang
aae770eda5
[automerger skipped] Merge "Add footer preference into caption preferences" into qt-r1-dev am: 5fc6db2cf7
...
am: 08be6c4a848f4b8b9a74
2019-07-18 01:16:18 -07:00
Kevin Chang
5f7a01d9d5
[automerger skipped] Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev am: 6bfc381173
...
am: 8c17c2f588c375bfde87
2019-07-18 01:15:24 -07:00
Kevin Chang
f5330096fc
[automerger skipped] Merge "UI change in caption preferences in Settings" into qt-r1-dev am: af447c17b8
...
am: 42f6f19216fd1f1c0f82
2019-07-18 01:12:58 -07:00
Kevin Chang
08be6c4a84
Merge "Add footer preference into caption preferences" into qt-r1-dev
...
am: 5fc6db2cf7
2019-07-18 00:53:55 -07:00
Kevin Chang
8c17c2f588
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
...
am: 6bfc381173
2019-07-18 00:53:02 -07:00
Kevin Chang
42f6f19216
Merge "UI change in caption preferences in Settings" into qt-r1-dev
...
am: af447c17b8
2019-07-18 00:52:00 -07:00
Kevin Chang
5fc6db2cf7
Merge "Add footer preference into caption preferences" into qt-r1-dev
2019-07-18 06:59:47 +00:00
Kevin Chang
6bfc381173
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
2019-07-18 06:59:45 +00:00
Kevin Chang
af447c17b8
Merge "UI change in caption preferences in Settings" into qt-r1-dev
2019-07-18 06:59:41 +00:00
Raff Tsai
f7e3095464
Fix Disabled text color in dark theme
...
Fixes: 137639665
Test: manual
Change-Id: Ie3786c446ea0b9ca484069db65dcefda45ac28c8
2019-07-18 10:12:21 +08:00
Kevin Chang
5277da96c2
Add footer preference into caption preferences
...
Add footer preference into caption preferences to tell users
that the setting doesn't support all apps.
Reference link of screenshot:
https://drive.google.com/file/d/1VzpWa4M-4HjlfjDNNqrEIKwo3v0y_f51/view?usp=sharing
Bug: 135888603
Test: Visual
Change-Id: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
Merged-In: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
(cherry picked from commit 8f4b8b9a74
2019-07-17 11:28:01 +00:00
Kevin Chang
04dea2b5c2
Add new reminder in "Magnify with shortcut" page
...
Add new reminder string in "Magnify with shortcut" page when
it's under gesture navigation mode.
Reference link of screenshot:
https://drive.google.com/file/d/1uo31FZebhXKcCR8QY_WrgEPiInzARmIl/view?usp=sharing
Bug: 134645913
Test: Visual
Change-Id: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
Merged-In: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
2019-07-17 11:27:37 +00:00
Kevin Chang
ef9cd2ac95
UI change in caption preferences in Settings
...
Move the switch after the caption preview and change the oreder of the
settings inside in caption preferences in Accessibility settings.
Reference link for screenshot:
https://drive.google.com/file/d/1EQLpfQFnJTwU1F8vLAOSHPYqSXKWL_ap/view?usp=sharing
Bug: 130755332
Test: Visual
Change-Id: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
Merged-In: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
(cherry picked from commit fd1f1c0f82
2019-07-17 11:27:06 +00:00
Stanley Wang
d2b2d9898e
Merge "Fix app uninstalling/stopping possible in screen pinning mode"
2019-07-17 10:17:32 +00:00
TreeHugger Robot
1258c94f9d
Merge "Increase height of edittext"
2019-07-17 09:38:56 +00:00
hughchen
7879047f65
Increase height of edittext
...
Bug: 131134021
Test: RunSettingsRoboTests
Change-Id: Ia85b99d2b1f7b730e66516e61a14979b0f68daa8
2019-07-17 14:34:00 +08:00
Stanley Wang
161c359508
Fix app uninstalling/stopping possible in screen pinning mode
...
Bug: 135604684
Test: maunal & robotest
Change-Id: I96eddb11ff32c6c46915682eb58857be7d24ed99
2019-07-17 10:58:52 +08:00
Yi Jiang
06f0bd6d4e
Don't show suggestion slice if 'Screen attention' is already on
...
Bug: 137259771
Test: Manually
Change-Id: I5568b569ecd4db943f1a239c7ddcd2923bec4028
2019-07-16 17:17:31 +00:00
TreeHugger Robot
1c6a2fac78
Merge "Add a vertical padding to DND button"
2019-07-16 11:40:59 +00:00
TreeHugger Robot
932c8eaa68
Merge "Remove deprecated code"
2019-07-16 06:11:40 +00:00
Jason Chiu
71e9f9147a
Add a vertical padding to DND button
...
Button is too close to divider
Test: visual, robotest
Fixes: 134406305
Change-Id: I1c2d8d2fad78ea3068a61b8aaa1c255328cf084f
2019-07-16 14:08:31 +08:00
Raff Tsai
58cd356273
Remove deprecated code
...
Fixes: 137106225
Test: rebuild
Change-Id: I7c757fc39197d2b6166fc8cbd9ad585ba16a7e2e
2019-07-16 10:35:04 +08:00
Antony Sargent
6dd874305e
Make MobileNetworkActivity support onNewIntent
...
The launchMode for MobileNetworkActivity specified in the android
manifest is "singleTask", which means that when an intent to it is
launched, if there is an existing instance we will reuse that instead of
creating a new one. But to handle this properly we need to know when it
happens by implementing onNewIntent, which we weren't doing.
Implementing this fixes a bug we noticed that if you have multiple SIMs
and recently visit the details page for SIM 1 but then click on a SIM
selection notification that should bring you to the details for SIM 2,
we'd just bring up the details page for SIM 1 again.
Fixes: 133447239
Test: make RunSettingsRoboTests
Change-Id: Ia9106b15ffde437f6dd6fd2da23336ec5b28f75e
2019-07-15 17:11:19 -07:00
TreeHugger Robot
2e9c4c4978
Merge "Remove Settings from recents after app uninstall"
2019-07-15 22:57:06 +00:00
Joshua Mccloskey
b441c8ab91
Merge "Fixed Settings Crash" into qt-r1-dev am: 800e8a485f
...
am: d5cac4a3f6
2019-07-15 13:22:30 -07:00
Joshua Mccloskey
d5cac4a3f6
Merge "Fixed Settings Crash" into qt-r1-dev
...
am: 800e8a485f
2019-07-15 13:10:52 -07:00
Joshua Mccloskey
800e8a485f
Merge "Fixed Settings Crash" into qt-r1-dev
2019-07-15 19:40:23 +00:00
Bill Yi
725b236039
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours am: 09be23ffaa -s ours
...
am: 4919b857e6
2019-07-15 01:34:52 -07:00
Bill Yi
0a30a102af
[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours am: 7903044b2b -s ours
...
am: 5a71e96c3a
2019-07-15 01:34:14 -07:00
Android Build Merger (Role)
4919b857e6
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours am: 09be23ffaa -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-15 08:28:50 +00:00
Bill Yi
7d98d178e9
[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
...
am: 09be23ffaa
2019-07-15 01:28:32 -07:00
Bill Yi
5a71e96c3a
[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
...
am: 7903044b2b
2019-07-15 01:28:12 -07:00
