Jie Cheng
74ffa3a130
Merge "Preference SimSettingsActivity not aligned correctly" am: 8d3d166823
...
am: c6525f5e24
2017-11-16 20:20:45 +00:00
Jie Cheng
c6525f5e24
Merge "Preference SimSettingsActivity not aligned correctly"
...
am: 8d3d166823
2017-11-16 20:18:44 +00:00
Treehugger Robot
8d3d166823
Merge "Preference SimSettingsActivity not aligned correctly"
2017-11-16 20:14:27 +00:00
Jie Cheng
e0aa432978
Preference SimSettingsActivity not aligned correctly
...
The preference SimSettingsActivity in the screen "Network & Internet"
never uses a summary. However the text for this preference ("SIM cards")
is top aligned in order to make room for an extra line for the
non-existing summary.
Solved by setting the summary to @string/summary_empty for the
preference SimSettingsActivity. This will make the text in the
preference to align correctly and not leave extra room for a summary.
Test: manual - Checked that preference SimSettingsActivity is correctly
aligned in screen "Network & Internet".
Bug: 69405185
Change-Id: I1a1b3fa7253bbf2a5299f54cc8c4d3e857ca059c
2017-11-16 15:57:08 +00:00
Fan Zhang
7d72837179
Merge "Catch exception when checking WifiDisplay availability" am: 7a08901d1b
...
am: 6d5e7bf41f
2017-11-16 01:36:10 +00:00
Fan Zhang
6d5e7bf41f
Merge "Catch exception when checking WifiDisplay availability"
...
am: 7a08901d1b
2017-11-16 01:33:31 +00:00
Treehugger Robot
7a08901d1b
Merge "Catch exception when checking WifiDisplay availability"
2017-11-16 01:27:57 +00:00
Fan Zhang
e0fdec2750
Catch exception when checking WifiDisplay availability
...
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes: 68013053
Test: robotests
2017-11-15 15:12:14 -08:00
Bruno Martins
440373dbde
Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26
...
am: 7431ad3a80
2017-11-15 21:56:18 +00:00
Bruno Martins
7431ad3a80
Merge "Settings: Add notification channel for SIM selection"
...
am: c543d5ba26
2017-11-15 21:54:16 +00:00
Treehugger Robot
c543d5ba26
Merge "Settings: Add notification channel for SIM selection"
2017-11-15 21:45:41 +00:00
Bill Yi
ecb8315ba4
Import translations. DO NOT MERGE am: fbdea47c44 -s ours
...
am: 8b334cb99a
2017-11-15 03:40:05 +00:00
Bill Yi
105f962faa
Import translations. DO NOT MERGE
...
am: cc5fd487eb
2017-11-15 03:39:22 +00:00
Bill Yi
8b334cb99a
Import translations. DO NOT MERGE
...
am: fbdea47c44
2017-11-15 03:37:20 +00:00
Xin Li
274f3b22b7
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
...
Change-Id: I981fa64f2c744afc31502e29df041c091bf98545
2017-11-14 16:38:23 -08:00
Bruno Martins
4c7070241a
Settings: Add notification channel for SIM selection
...
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
2017-11-14 22:28:59 +00:00
Bill Yi
fbdea47c44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241
2017-11-14 12:42:27 -08:00
Bill Yi
cc5fd487eb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic67e156508ed64a3ae1f26c095f72929f29e9b63
2017-11-14 12:38:18 -08:00
Xin Li
0599c79cf7
Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from
...
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
2017-11-13 15:18:37 -08:00
tiansiming
78d7e2a096
Merge "Modify Comparator in ZonePicker" am: 3c03207f9f
...
am: cd2e1c1535
2017-11-13 19:52:12 +00:00
tiansiming
cd2e1c1535
Merge "Modify Comparator in ZonePicker"
...
am: 3c03207f9f
2017-11-13 19:50:06 +00:00
Treehugger Robot
3c03207f9f
Merge "Modify Comparator in ZonePicker"
2017-11-13 19:45:10 +00:00
tiansiming
3b8c4cd52e
Modify Comparator in ZonePicker
...
The previous method "compareTo" isn't locale-sensitive, it cannot
sort the String in some other languages. So Collator is recommended
to be applyed here.
Bug: Sort doesn't work in some languages.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=ZonePickerComparatorTest
Change-Id: Id107ab938cceefc77f9fb6918a0445fc92a0fcb7
Signed-off-by: tiansiming <tiansiming@xiaomi.com >
2017-11-10 23:12:38 +00:00
Yoshinori Hirano
bfc6983947
Merge "Send broadcast when location mode is about to change DO NOT MERGE" am: 1c05be48ae -s ours
...
am: 5c50b5362b
2017-11-10 15:21:37 +00:00
Yoshinori Hirano
5c50b5362b
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
...
am: 1c05be48ae
2017-11-10 15:14:43 +00:00
Treehugger Robot
1c05be48ae
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
2017-11-10 15:07:04 +00:00
Yoshinori Hirano
d35311e993
Send broadcast when location mode is about to change DO NOT MERGE
...
Send "com.android.settings.location.MODE_CHANGING" broadcast intent
when the location mode is about to be changed on Settings app or
Quick Settings.
Fixes: 28057031
Test: manual - turn the location setting on
Change-Id: Icd1049259403999a30263cc866698795b44f9b2e
2017-11-10 10:45:34 +09:00
songkailun
de80f4ee5f
Merge "remove unused code in PrivacySettings" am: abd78cc6b3
...
am: 0da27eb08c
2017-11-09 21:21:37 +00:00
songkailun
0da27eb08c
Merge "remove unused code in PrivacySettings"
...
am: abd78cc6b3
2017-11-09 21:19:30 +00:00
Treehugger Robot
abd78cc6b3
Merge "remove unused code in PrivacySettings"
2017-11-09 21:11:22 +00:00
songkailun
46644059a5
Merge "translate array in res/values-ar" am: 0df2c8fbb7
...
am: 834025ef19
2017-11-09 20:59:59 +00:00
songkailun
834025ef19
Merge "translate array in res/values-ar"
...
am: 0df2c8fbb7
2017-11-09 20:53:10 +00:00
Treehugger Robot
0df2c8fbb7
Merge "translate array in res/values-ar"
2017-11-09 20:40:18 +00:00
Ningyuan Wang
1df7ba1cb6
Enforce null check for mAccessPoint
...
am: 6c12f06bf8
2017-11-08 21:37:34 +00:00
Ningyuan Wang
6c12f06bf8
Enforce null check for mAccessPoint
...
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.
Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f4
2017-11-08 18:24:48 +00:00
songkailun
199cb39de9
remove unused code in PrivacySettings
...
factory_reset is already removed from privacy_settings.xml,
so it need to be removed from PrivacySettings.java too
Change-Id: I0d295b90173102efb962dde496cf7a8b15d1e0a9
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-11-07 11:51:57 +00:00
songkailun
fb1440952b
translate array in res/values-ar
...
"None" should be translated
Change-Id: I9cd1b21947834a070ba66a7ee7641d0b6617de52
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-11-07 11:51:02 +00:00
Bill Yi
c8de736ea2
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 7b75c5a338
2017-11-07 09:48:01 +00:00
TreeHugger Robot
7b75c5a338
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-07 09:41:30 +00:00
Bill Yi
f2b1de1435
Import translations. DO NOT MERGE am: 73120a4cdb -s ours
...
am: f74efef4fb
2017-11-07 09:35:56 +00:00
Bill Yi
f74efef4fb
Import translations. DO NOT MERGE
...
am: 73120a4cdb
2017-11-07 09:33:26 +00:00
Bill Yi
73120a4cdb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
2017-11-06 23:21:01 -08:00
Bill Yi
80f3654189
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180
2017-11-06 23:20:38 -08:00
Erik Kline
3194e6cbb8
Merge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b
...
am: 768f467089
2017-11-07 06:08:59 +00:00
Erik Kline
768f467089
Merge "Replace dns_tls with private_dns_mode setting"
...
am: ca92fb5e2b
2017-11-07 06:00:15 +00:00
Treehugger Robot
ca92fb5e2b
Merge "Replace dns_tls with private_dns_mode setting"
2017-11-07 05:54:28 +00:00
Erik Kline
1ea5dd05c3
Replace dns_tls with private_dns_mode setting
...
Also includes:
- new layout fragment for private DNS configuration
- PrivateDnsModeDialogPreference handler class
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual interaction with private dns developer option works
Bug: 34953048
Bug: 6413396
Change-Id: I3a5490c21f7f3b3e523a247c287f213d19b75a8b
2017-11-07 12:28:48 +09:00
Fan Zhang
eb7e3e0385
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours am: 5af580a419 -s ours
...
am: fbc2fd065c
2017-11-03 00:47:06 +00:00
Fan Zhang
fbc2fd065c
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours
...
am: 5af580a419
2017-11-03 00:42:12 +00:00
Fan Zhang
5af580a419
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours
...
am: ef61a45cf6
2017-11-03 00:40:07 +00:00
