Commit Graph

40000 Commits

Author SHA1 Message Date
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
Qi Ding
35a3260b91 Merge "Fix current tab is changed when rotating device"
am: 3d8b442e8d

Change-Id: I4f8499492b7fbe26e40da649e38ab0a65667e55d
2017-10-27 18:47:40 +00:00
Treehugger Robot
3d8b442e8d Merge "Fix current tab is changed when rotating device" 2017-10-27 18:38:37 +00:00
Qi Ding
4ca4bd31c3 Fix current tab is changed when rotating device
Even if SIM slot 2 is selected in SIM card lock settings,
the current tab is changed to SIM slot 1 when rotating the device.
To fix this issue, the current tab should be restored
after rotating the device.

Fixes: 63690125
Test: manual - go to Settings > Security > SIM card lock
               and rotate device

Change-Id: I874d4d06019e21dd7b65951a3aefb75ff5ea298b
2017-10-26 14:39:03 +09:00
Bill Yi
2ef76cb0d2 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: aa8a972ea3

Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93
2017-10-24 20:33:44 +00:00
Fan Zhang
e373209b97 Merge "Fix wrong position of cursor in OwnerInfoSettings"
am: 2bcbc35b29

Change-Id: I37d5d73c9dc2dc64c6437c8e1a2786df616ee2f6
2017-10-24 20:33:03 +00:00
Bill Yi
aa8a972ea3 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2017-10-24 11:32:26 -07:00
Fan Zhang
2bcbc35b29 Merge "Fix wrong position of cursor in OwnerInfoSettings" 2017-10-24 18:13:25 +00:00
tiansiming
7206a2998d Fix wrong position of cursor in OwnerInfoSettings
Bug:N/A
Test:Settings -> Security -> right settings icon of Screen lock
-> Lock screen message.
The cursor shows at the forefront of this EditText.

Change-Id: I86fe1bdbe78f700053e38b0cba4a5c8365af946e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-10-24 17:19:27 +08:00
Jack Yu
3966912efa Merge "Refactored area update info support"
am: 60d6ffbc6c

Change-Id: I955c44c5d2c07dee0be7ae9990c0234eb989538f
2017-10-20 19:30:29 +00:00
Treehugger Robot
60d6ffbc6c Merge "Refactored area update info support" 2017-10-20 19:19:09 +00:00
TreeHugger Robot
a5d652c89f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-10-20 15:28:33 +00:00
Ben Schwartz
ed97eaeb4a Merge "Add a developer option for controlling DNS over TLS"
am: c8207de343

Change-Id: I688d2131294c2b4995d7f8f79e7819feb89573c3
2017-10-20 15:06:10 +00:00
Treehugger Robot
c8207de343 Merge "Add a developer option for controlling DNS over TLS" 2017-10-20 14:58:39 +00:00
Bill Yi
074e2ee9ba Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Id09f849aa6cdf8d983697e7a6a7f182c5f76e623
2017-10-20 03:21:50 -07:00
Jack Yu
2f010230df Refactored area update info support
1. Refactored area update information support so it
   is not limited to channel 50 and Brazil.
2. Added channel 60 for India.

Test: Manual
bug: 37746109
Change-Id: I470cc470f880aadd4f63815e21cdd4a71436a89d
(cherry picked from commit c3cab8ecb8)
2017-10-19 17:36:33 -07:00