Commit Graph

19248 Commits

Author SHA1 Message Date
jackqdyulei
dc75d02b95 Merge "Add owners to setting packages." am: f82cd59476
am: e6f052e928

Change-Id: Ie9bcc92888073e504ac444c42bc801c50aac7eb5
2017-11-21 16:46:24 +00: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
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
Fan Zhang
7d72837179 Merge "Catch exception when checking WifiDisplay availability" am: 7a08901d1b
am: 6d5e7bf41f

Change-Id: I8e1453bdd39ce220381a3368846bb137c4878dd4
2017-11-16 01:36:10 +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
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

Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
2017-11-15 21:56:18 +00: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
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
78d7e2a096 Merge "Modify Comparator in ZonePicker" am: 3c03207f9f
am: cd2e1c1535

Change-Id: I97ec8751980a29d953f1a49b36cc78b66461e3e7
2017-11-13 19:52:12 +00: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
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

Change-Id: I3e82479c29fe00c195b80e80497aaa2b402146cd
2017-11-09 21:21:37 +00:00
Ningyuan Wang
1df7ba1cb6 Enforce null check for mAccessPoint
am: 6c12f06bf8

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

Change-Id: I70b86f3e2ebf823fea8a1516031f9137b2813bb3
2017-11-07 06:08:59 +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
Courtney Goeltzenleuchter
aba6fd61a2 Merge "Check system support of wide-color" into oc-mr1-dev
am: e86bc950df

Change-Id: I166488d015cc7f8518fd3e3d1cc819fe23cc4ba3
2017-11-02 00:44:46 +00: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
Courtney Goeltzenleuchter
66e4dac393 Check system support of wide-color
getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.

Bug: 64801219
Bug: 67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.

Change-Id: If28e52da174dd460850bc84744818979f52add78
(cherry picked from commit bae1b24ba3)
2017-10-31 08:25:37 -06:00
xiyuan.wang
029aeca640 Merge "Fix app crash while adding new user" am: 1e5cd4c3df
am: 5cf3dcd11c

Change-Id: I328ca5045b1fabf9f6756cc0265458bda531fccf
2017-10-30 18:17:47 +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
5dbb625508 Merge "Fix current tab is changed when rotating device" am: 3d8b442e8d
am: 35a3260b91

Change-Id: I1ae5051dfb35d75c99d0d44ce2689b6e81d47a81
2017-10-27 18:52:47 +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
Christine Franks
7f3176aceb DO NOT MERGE - Move color mode to DisplayTransformManager
am: cd2b7aea5f

Change-Id: I1ebad738c64493b1929b2eb299b41c1bb365f6fe
2017-10-25 20:23:06 +00:00
Christine Franks
cd2b7aea5f DO NOT MERGE - Move color mode to DisplayTransformManager
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100

Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
2017-10-25 12:42:23 -07:00
Chia-I Wu
c892a3cfc9 Merge "Add new color mode setting" into oc-mr1-dev
am: 94aa05059d

Change-Id: I31d9b51c1299564546a61a708f2058a815dd2974
2017-10-25 04:38:57 +00:00
Romain Guy
05fa18f847 Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)

The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).

Bug: 68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
2017-10-24 22:19:09 +01:00
Fan Zhang
614f7aafdc Merge "Fix wrong position of cursor in OwnerInfoSettings" am: 2bcbc35b29
am: e373209b97

Change-Id: I67452d72f814fc0a1f11fd7699a1134f03a00a6f
2017-10-24 20:41:16 +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
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
Rajeev Kumar
ac0fd76521 Remove SearchIndexProvider from DataPlanUsageSummary fragment.
am: dd8e66fa20

Change-Id: I0b27a9c68a17f87876d477bad0d10b270aecd550
2017-10-24 05:01:49 +00:00
Rajeev Kumar
dd8e66fa20 Remove SearchIndexProvider from DataPlanUsageSummary fragment.
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.

Bug: 68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
2017-10-23 21:51:02 -07:00
Treehugger Robot
60d6ffbc6c Merge "Refactored area update info support" 2017-10-20 19:19:09 +00:00
Ben Schwartz
2372074d57 Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a
am: 1fd46833ef

Change-Id: I30f6c28acc3825ff51190d1d54494cac5d774497
2017-10-20 15:33:50 +00:00
Ben Schwartz
1fd46833ef Merge "Add a developer option for controlling DNS over TLS" am: c8207de343
am: ed97eaeb4a

Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240
2017-10-20 15:15:14 +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
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
tiansiming
cca755cfac Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43
am: ecf2bdb46f

Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e
2017-10-19 19:24:53 +00:00
tiansiming
ecf2bdb46f Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef
am: 92e77cbd43

Change-Id: Icfa12295c4111766f4c189443b9a6997a1cc0031
2017-10-19 19:22:16 +00:00
tiansiming
92e77cbd43 Merge "Fix wrong position of cursor in IccLockSettings"
am: 3a3044eeef

Change-Id: I26f1c35505538768a7816f038c44437fe9a08f67
2017-10-19 19:20:09 +00:00