Bill Yi
efc7ac061c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ce6d671fe6587af26ea31b711da0d4594433ee6
2019-07-19 10:23:51 -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
Change-Id: I21991a0d06bf861d6a0fd6906b455a36d8b10c55
2019-07-18 20:06:19 -07:00
Antony Sargent
f61428cf1d
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
...
am: 20ec6a4b6f
Change-Id: I72317d0d45103cbc4791e1f9d67e726d7426b758
2019-07-18 19:57:18 -07:00
Antony Sargent
dd874eeb54
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
...
am: 20ec6a4b6f
Change-Id: I512000e6041c3611d4c7715355d8564aa3261b01
2019-07-18 19:57:18 -07:00
Arc Wang
a12b372dd2
[Wi-Fi DPP] Refine code
...
Remove unused code.
Rename some variables and methods for better readability.
Fix typos.
Reduce unnecessary variable scope and method scope.
Simplify some code logic.
Bug: 120645817
Test: atest com.android.settings.wifi.dpp
Change-Id: I8f30b3e445f25ada927e995befee1783d2270b91
2019-07-19 10:29:06 +08:00
TreeHugger Robot
20ec6a4b6f
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
2019-07-19 02:26:19 +00:00
Mehdi Alizadeh
1aaf41b2dc
Removes logic to disable gesture nav when default home app changes
...
Bug: 137197916
Test: Manual test with setting a 3P launcher as default
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Change-Id: Id397cfa1c2439222aa21a7b7fe5f69818bf1fe97
2019-07-18 15:27:05 -07:00
Bill Yi
5d1c65e3e9
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours am: 1f4b32a154
-s ours
...
am: aaae63aaa9
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie5d7634343da300257e1ef469759660ef59ee57e
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I31f26e54f6eb69af4f6e925d616f7dd4c14f54d0
2019-07-18 14:42:41 -07:00
Mady Mellor
22c920cc01
Use the Global value rather than the Secure value
...
Fixes: 137876221
Test: manual - have setting in dev options turned off, post a bubble
=> no bubble appears
- have setting in dev options turned on, post a bubble
=> bubble appears
Change-Id: I4490b978059a73b45fa8d09bf28e05965f42eec1
2019-07-18 14:40:04 -07:00
Bill Yi
10ea3f7280
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours
...
am: 1f4b32a154
-s ours
am skip reason: subject contains skip directive
Change-Id: I23c9c5e6e8bdf6f59733d7fefbe658699ae997c4
2019-07-18 14:37:11 -07:00
Bill Yi
8e25581401
[automerger skipped] Import translations. DO NOT MERGE
...
am: 56887f467c
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifdb15f70ca027f4a429dbf84d03a5b82096aaac7
2019-07-18 14:36:14 -07:00
Bill Yi
e7a46a0f2b
[automerger skipped] Import translations. DO NOT MERGE am: 56887f467c
-s ours
...
am: f36921c04b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieaa51e11b9cf70ffff2938d76b9933672c7a2b0e
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I000d7b47e58b2238e6969ae321aa09d170555d5d
2019-07-18 14:33:35 -07:00
Bill Yi
160a6efb72
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours
...
am: ad2542c534
-s ours
am skip reason: subject contains skip directive
Change-Id: I5738457ce2d693b01b1368dc17987ee77de9a33d
2019-07-18 14:33:33 -07:00
Bill Yi
ad2542c534
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
-s ours
am skip reason: subject contains skip directive
Change-Id: I52627f2e7b30beb857a5e7c8ca955671ceefef28
2019-07-18 14:24:36 -07:00
Bill Yi
f36921c04b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 56887f467c
-s ours
am skip reason: subject contains skip directive
Change-Id: I0f83f2ea5a5f6fdd6659a9113b7561ea63ebf097
2019-07-18 14:24:36 -07:00
Bill Yi
1f4b32a154
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
-s ours
am skip reason: subject contains skip directive
Change-Id: I888c9b99282dcccfe58db799c1c02ceed4b63747
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
Lyn Han
d39e874570
Merge "Secure => global bubble settings pt 2" into qt-r1-bubbles-dev
2019-07-18 14:30:16 +00: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: 08be6c4a84
-s ours
am skip reason: change_id I95e0aa301eba7343fbc798cc406c0242f4f4eb7e with SHA1 8f4b8b9a74
is in history
Change-Id: Ic3153cef6f388c59f30a283cc47db435c774ab73
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: 8c17c2f588
-s ours
am skip reason: change_id Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6 with SHA1 c375bfde87
is in history
Change-Id: I59d411384dcb192d2c026f3787e413463cd24d1a
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: 42f6f19216
-s ours
am skip reason: change_id Icb4dabdef71be165a21d1bde474872ee0bb35bfa with SHA1 fd1f1c0f82
is in history
Change-Id: Iae29b42f2804fd6efd40f1b9625fa81d7a133b75
2019-07-18 01:12:58 -07:00
Kevin Chang
08be6c4a84
Merge "Add footer preference into caption preferences" into qt-r1-dev
...
am: 5fc6db2cf7
Change-Id: I02eb493be2b958b766f06d85dde7aabcc1230a68
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
Change-Id: Ic0b481b5306a91c58f1aeea4cb125874d6b77d2e
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
Change-Id: I5b669681267875963d9b91471bdb63a57b1c84b0
2019-07-18 00:52:00 -07:00
Kevin Chang
ada6b6f88e
Merge "Add footer preference into caption preferences" into qt-r1-dev
...
am: 5fc6db2cf7
Change-Id: I66530a3acd24e227d3c659e03bed62db58d7fe92
2019-07-18 00:44:44 -07:00
Kevin Chang
55be763ccd
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
...
am: 6bfc381173
Change-Id: Ic7255bbfdb06c5a38073198073d37f3ba1207d4c
2019-07-18 00:43:52 -07:00
Kevin Chang
2a725532f5
Merge "UI change in caption preferences in Settings" into qt-r1-dev
...
am: af447c17b8
Change-Id: Iba6562299043b23d2f3b5cbb06ed4ae23dede871
2019-07-18 00:42:38 -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
cosmohsieh
a5e0148c7a
[NetworkRequest] Implement Single Specified SSID ALTERNATE FLOW V2
...
Implement new flow for Single SSID mode of NetworkRequestDialog.
There is a new design for single SSID mode of NetworkRequestDialog.
Bug: b/132904234
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ice19842243ea6f24a3ea74cf6e90a473080b8983
2019-07-18 12:04:02 +08: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