Commit Graph

39965 Commits

Author SHA1 Message Date
Bill Yi
e55bc2b591 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I4c880093e20e7178ce80006b158fefd490b4e061
2017-11-30 04:05:41 -08:00
Malcolm Chen
9d30592308 Merge "Remove extra newline in AndroidManifest."
am: 8aeb69396d

Change-Id: I36ea57db56ff985da118fb7ab117bf939b7b2dc1
2017-11-29 00:31:49 +00:00
Treehugger Robot
8aeb69396d Merge "Remove extra newline in AndroidManifest." 2017-11-29 00:22:47 +00:00
songkailun
94cd0e4373 Merge "DO NOT MERGE translate arrays in Settings/res"
am: 992a4e5500  -s ours

Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042
2017-11-22 18:49:59 +00:00
Treehugger Robot
992a4e5500 Merge "DO NOT MERGE translate arrays in Settings/res" 2017-11-22 18:36:14 +00:00
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
e6f052e928 Merge "Add owners to setting packages."
am: f82cd59476

Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f
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
5b59b71f12 Merge "Add an activity that starts DataUsageList fragment for mobile."
am: 942d418da9  -s ours

Change-Id: I23e52f28f5e0873094476eda4698677e4c736f4e
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
Jie Cheng
c6525f5e24 Merge "Preference SimSettingsActivity not aligned correctly"
am: 8d3d166823

Change-Id: I67a977b974ddbf42b01647e4ca02d7d9dfe1b61d
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
6d5e7bf41f Merge "Catch exception when checking WifiDisplay availability"
am: 7a08901d1b

Change-Id: I426208a605e3771238bd91c135e47faf1b559e58
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
7431ad3a80 Merge "Settings: Add notification channel for SIM selection"
am: c543d5ba26

Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
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
Bruno Martins
4c7070241a Settings: Add notification channel for SIM selection
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
2017-11-14 22:28:59 +00: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
cd2e1c1535 Merge "Modify Comparator in ZonePicker"
am: 3c03207f9f

Change-Id: I1c2ebde217a793091ff28f9b2b1850beeb494d52
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
5c50b5362b Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am: 1c05be48ae  -s ours

Change-Id: Ia443491992c0b28a15d93ca344e9b20c0a111548
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
0da27eb08c Merge "remove unused code in PrivacySettings"
am: abd78cc6b3

Change-Id: I8772066bf9bf759628f1937ca1949086a8ff8509
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
834025ef19 Merge "translate array in res/values-ar"
am: 0df2c8fbb7

Change-Id: Ic6175d77665dddd9ccaee29b94be3a11025f45c9
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
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
Erik Kline
768f467089 Merge "Replace dns_tls with private_dns_mode setting"
am: ca92fb5e2b

Change-Id: I58c44a04ef75d025f63e9470ed9624a437a7956c
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
Malcolm Chen
32ced85d54 Merge "Updates strings for "Emergency broadcast"."
am: b13f2e0fb0

Change-Id: I5b17156c3fd9fa680dc872ddbcab6dd8ac30a87e
2017-11-02 00:48:12 +00:00
Treehugger Robot
b13f2e0fb0 Merge "Updates strings for "Emergency broadcast"." 2017-11-02 00:42:48 +00:00
Malcolm Chen
bd124449c0 Updates strings for "Emergency broadcast".
Replace "Emergency broadcast" with "Emergency alerts" to be
consistent.

Test: manual
Bug: b/62291344
Change-Id: I79d6f1162d4c112dedf49a3b43ec26011adba9bf
2017-11-01 16:49:36 -07:00
Jeff Sharkey
46b8d7ac78 Merge "Change storage migration to use quota APIs."
am: a0afdb0c49

Change-Id: Ie97a6001eb23314c65aff291f53cf575b7637870
2017-10-31 22:24:12 +00:00
Fan Zhang
931504bb24 Merge "Add a readme with instructions on running tests"
am: 08217cbd4b

Change-Id: I654b6bf10ca75715e433d1382756e380723ae324
2017-10-31 22:23:15 +00:00
Treehugger Robot
a0afdb0c49 Merge "Change storage migration to use quota APIs." 2017-10-31 21:47:19 +00:00
Treehugger Robot
08217cbd4b Merge "Add a readme with instructions on running tests" 2017-10-31 21:42:28 +00:00
Fan Zhang
83e7581690 Add a readme with instructions on running tests
Test: is a test
Change-Id: I5f3a4745a1b2376259b2aab8df58d8660c3fe0bc
2017-10-31 13:14:58 -07:00
Jeff Sharkey
efe4b48d9b Change storage migration to use quota APIs.
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.

(cherry picked from commit fc522c677d)

Bug: 36056324
Test: builds, boots
Merged-In: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
Change-Id: Icdf774cff520a4b7ca6ec210b34a1c5ff85f8110
2017-10-31 09:48:11 -07:00
xiyuan.wang
5cf3dcd11c Merge "Fix app crash while adding new user"
am: 1e5cd4c3df

Change-Id: I0cb1c3a228b85edb6303d4f6c33037e4f787f550
2017-10-30 18:03:09 +00:00
Treehugger Robot
1e5cd4c3df Merge "Fix app crash while adding new user" 2017-10-30 17:43:46 +00:00
xiyuan.wang
b6fa43d980 Fix app crash while adding new user
Settings app crashes when tapping Home key while adding new user because
UserSettings#showDialog() is called after onSaveInstanceState().
To fix this issue, a dialog should not be shown after onPause().

Fixes: 68485787
Test: manual - tap Home key while adding new user

Change-Id: I2ddd119b6558927798a52c7977e6fd8137734c93
2017-10-30 19:55:56 +09:00