songkailun
d0fa1537cb
DO NOT MERGE translate arrays in Settings/res
...
"None" should be translated
Change-Id: I12a30e6476ec41c2a3bf1878d6b5596bf5ee8ed7
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-11-22 17:14:41 +00:00
Malcolm Chen
9b3b138074
Remove extra newline in AndroidManifest.
...
Remove extra newline in AndroidManifest which caused
android.settings.MOBILE_DATA_USAGE not received.
Bug: b/63670955
Test: testcase MobileDataUsageActivityTest
Change-Id: I4a4178141010b128e3d9c8c9721a51b81cbdffff
2017-11-21 12:15:02 -08:00
jackqdyulei
dc75d02b95
Merge "Add owners to setting packages." am: f82cd59476
...
am: e6f052e928
2017-11-21 16:46:24 +00:00
jackqdyulei
e6f052e928
Merge "Add owners to setting packages."
...
am: f82cd59476
2017-11-21 16:41:50 +00:00
Treehugger Robot
f82cd59476
Merge "Add owners to setting packages."
2017-11-21 16:35:30 +00:00
Malcolm Chen
df0a4bbcd3
Merge "Add an activity that starts DataUsageList fragment for mobile." am: 942d418da9 -s ours
...
am: 5b59b71f12
2017-11-21 00:58:56 +00:00
Malcolm Chen
5b59b71f12
Merge "Add an activity that starts DataUsageList fragment for mobile."
...
am: 942d418da9
2017-11-21 00:48:50 +00:00
jackqdyulei
d6a00cfa3f
Add owners to setting packages.
...
Bug: 65294119
Fixes: 69384604
Test: Build
Change-Id: Ib4fddc1f04087671d8445fd967d4262287e5c4f3
Merged-In: I927052a73f639d0894600611cd5c79293f43ff5e
Merged-In: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
Merged-In: I24ec103ff5013ad416e3dfb1c548acd387b4ba64
Merged-In: If9fddc8b4e2e6d4d7db185ab16063e824323b9a7
Merged-In: I49159950521a013422b1087ea2c3e6cd5151457c
Merged-In: I69af58183c5b89af96c1a8808665fa506a620012
Merged-In: Ie9492f497824cd2b2727dde9d3a48452c72f1084
Merged-In: I2fd0249fd8b555e5ca93c3aec13857e6c74e157c
Merged-In: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
Merged-In: Icdcfaaf6cc7a1e1cf77e89a79d0425cab4405ffc
Merged-In: I697528ff260a0f8e54aa1188e35143e668800e7d
Merged-In: I1486782f476acaf1e2e4b66df57869409239986f
Merged-In: I804b50a38c877da80b5ef3251e16029259014152
Merged-In: I39eec9ebc1db2dc14669f27b17624394e25eb47f
Merged-In: I054a6df08046cda1c2f202390ed24839a6b10349
Merged-In: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Merged-In: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
2017-11-20 16:39:59 -08:00
Treehugger Robot
942d418da9
Merge "Add an activity that starts DataUsageList fragment for mobile."
2017-11-21 00:35:41 +00:00
Bill Yi
967ad51df4
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 59a800d0ec
2017-11-20 22:53:31 +00:00
TreeHugger Robot
59a800d0ec
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-20 22:46:59 +00:00
Bill Yi
97c257520a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266 -s ours
...
am: 9a7789a0fc
2017-11-20 22:36:07 +00:00
Bill Yi
9a7789a0fc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: ae351b3266
2017-11-20 22:31:36 +00:00
TreeHugger Robot
ae351b3266
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-11-20 22:20:05 +00:00
Bill Yi
d4bae3a7a0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264
2017-11-20 11:40:38 -08:00
Bill Yi
c47fc92b8c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1
2017-11-20 11:39:36 -08:00
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
Antony Sargent
e14d38a383
Reword bluetooth confirmation dialog
...
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
2017-11-15 18:38:43 +00:00
Antony Sargent
f20e0a492b
Fix BluetoothPairingDialogTest to not expect device name
...
The functional fix for b/62672248 in ag/2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug: 62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
2017-11-15 18:38:36 +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
Malcolm Chen
ff4b4eac8b
Add an activity that starts DataUsageList fragment for mobile.
...
We are providing an itent and a corresponding activity to show
"Mobile data usage" fragment, so that "Mobile network setting"
who lives in phone apk can use that intent to open it.
Bug: 62201918
Test: Manual
Change-Id: I862f8bc90f9456f91b436d26472cce23c837a777
Merged-In: I862f8bc90f9456f91b436d26472cce23c837a777
2017-11-13 14:07:12 -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
