Commit Graph

19280 Commits

Author SHA1 Message Date
goneil
50f5d8cf66 Merge "Set EDITED column to USER_EDITED when editing APN" am: 90d284cab7
am: 1b0c8335e3

Change-Id: I0b37b48e160f8fcd7b96f6515b34e1cb765d2b24
2017-12-20 00:41:52 +00:00
Treehugger Robot
90d284cab7 Merge "Set EDITED column to USER_EDITED when editing APN" 2017-12-20 00:36:53 +00:00
rongrong.x.gao
fbc9e954d7 Merge "Launch new Home app when selecting Home app in Settings" am: f05fc290b7
am: b0ab6da4e3

Change-Id: I741b464e9903c13d68a3025d6cfbb057159ee950
2017-12-18 22:19:28 +00:00
Treehugger Robot
f05fc290b7 Merge "Launch new Home app when selecting Home app in Settings" 2017-12-18 22:09:25 +00:00
rongrong.x.gao
b573e23b48 Launch new Home app when selecting Home app in Settings
Launches the newly selected Home app when it has been selected in
Default Home app settings. This CL makes the change take effect
immediately, instead of when the Home button is pressed.

Bug: 70697830
Test: make RunSettingsRoboTests
Test: Manual - Change default home app in Settings
Change-Id: If7e2956bc6f8ddba0a7e8da48a0d38e3936c57e9
2017-12-16 12:44:01 +09:00
tiansiming
576e159641 Merge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758
am: 57b9039750

Change-Id: Iae5884c2950e479c746e7b7761a40c250121dc16
2017-12-15 22:38:29 +00:00
Treehugger Robot
4b6e1b0758 Merge "Fix NPE when press ttsEngines settings icon" 2017-12-15 22:30:04 +00:00
goneil
a05db0fac9 Set EDITED column to USER_EDITED when editing APN
TelephonyProvider switched from defaulting EDITED to USER_EDITED and now
defaults to CARRIER_EDITED in https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/570244.
Therefore, when the user edits the APN, we can no longer rely on the
default implementation

Bug: 67750905
Test: None
Change-Id: I4996b24da94f7c1883c3c802b8edd5e23db580b2
2017-12-15 21:54:25 +00:00
Robin Lee
df5053e85b Merge "Handle getActiveAdmins() == null safely." am: d46153c3d3
am: 70a6dfd647

Change-Id: I98ccb0e4eb0882e10c0266d3f1fbbddaa1073db8
2017-12-13 17:28:34 +00:00
Treehugger Robot
d46153c3d3 Merge "Handle getActiveAdmins() == null safely." 2017-12-13 17:16:38 +00:00
Hemant Gupta
40069b5ee2 Merge "Bluetooth: Add support for PBAP UI preference" am: f689d1aaa7
am: 0b4c0ebbe4

Change-Id: I5419efe379ee5bf0622ac8070b6ef3886d277bdf
2017-12-13 01:57:51 +00:00
Wang wenrui
9b3b72f6b2 Merge "Fix screen freeze when changing display size in Multi-Window mode" am: 2051822bb9
am: b2a6489139

Change-Id: I791f25687e37448659b3e0d91ad35f28dca0fed6
2017-12-13 01:56:50 +00:00
Treehugger Robot
f689d1aaa7 Merge "Bluetooth: Add support for PBAP UI preference" 2017-12-13 00:30:42 +00:00
Treehugger Robot
2051822bb9 Merge "Fix screen freeze when changing display size in Multi-Window mode" 2017-12-12 23:59:23 +00:00
Adam Lesinski
11ab7f7b82 Merge "Update the way OMS records details about overlays" into oc-mr1-dev
am: 15b42b89b8

Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313
2017-12-12 23:16:37 +00:00
TreeHugger Robot
15b42b89b8 Merge "Update the way OMS records details about overlays" into oc-mr1-dev 2017-12-12 21:48:17 +00:00
Robin Lee
1aeca095d3 Handle getActiveAdmins() == null safely.
Test: adb install -r $OUT/system/priv-app/Settings/Settings.apk && adb shell am start -n com.android.settings/.DeviceAdminAdd --es android.app.extra.DEVICE_ADMIN_PACKAGE_NAME com.example.nonexistent
Change-Id: I1e3cf406e8053f6dbf99669f33b7c16648c9c8f8
Fix: 70491813
2017-12-11 21:01:58 +01:00
Adam Lesinski
9e19121a00 Update the way OMS records details about overlays
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.

Bug: 69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
2017-12-07 19:40:19 +00:00
Hemant Gupta
13197bcc1e Bluetooth: Add support for PBAP UI preference
Usecase:
1) Connect with carkit that supports PBAP/MAP
2) Try to uncheck the checkbox for contact sharing from device sub
   settings menu

Expected Result:
1) DUT should display "Connected (No Media or Phone)"
1) Should be able to disconnect when checkbox moves from selected->unselected,
and carkit should be able to connect when checkbox is selected again

Observation:
1) No UI updates when PBAP/MAP are connected.
2) On unchecking Contact sharing checkbox nothing happens. PBAP connection
   remains active and user is not asked to disconnect profile level connection.

Fix:
Add support for PBAP UI preference in SettingsLib. Also Fix issues related to MAP
profile addition/removal.
Test: Connect from carkit, try disconnecting from sub settings menu by unchecking
Contact Sharing checkbox and check if PBAP is successfully disconnected.

Bug: 35014213
Change-Id: I4981aa063b2541b58ce1d36e3576578cbeb02acc
2017-12-07 09:31:03 +05:30
tiansiming
b65c4c3e25 Fix NPE when press ttsEngines settings icon
settingsIntent is obtained by method getSettingsIntent in
TtsEngines.java, and it has the chance to return null directly in
which case will lead to NPE crash when we startActivity in
TextToSpeechSettings.java with a null intent.
So, a judgement here makes sense.

Bug:https://issuetracker.google.com/issues/70266990
Test:
1) Install the apk "partner-BaiduSpeechService.apk" offered in the Bug link above.
2) Go to Settings -> Languages & input -> Advance -> Text-to-speech output
3) Choose "Duer voice engine 3.0" as the preferred engine
4) Press the settings icon in the right

Change-Id: I497a745ce62989f3ff1aee661648e90af25fb99e
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-12-07 10:08:34 +08:00
Wang wenrui
09c44bf78d Fix screen freeze when changing display size in Multi-Window mode
The device screen freezes when launching two Display size settings
screen and changing display size in Multi-Window mode.
To fix this issue, OnSeekBarChangeListener should be set in onStart() to
avoid onProgressChanged() is called during onRestoreInstanceState which
is caused by display size change.

Fixes: 70253030
Test: manual - open two Display size settings in Multi-Window mode.

Change-Id: I779954aeeb1da526ba1b0fac2676e2f7d8289352
2017-12-06 07:01:56 +00:00
Jordan Liu
d2b04e92fe Merge "Hide signal strength when told by carrier" am: 9afa720abe
am: ed9508f3a6

Change-Id: I43c22e7f6950adcf27a5b600a194927cbd06fb9b
2017-12-05 00:27:13 +00:00
Jordan Liu
ed9508f3a6 Merge "Hide signal strength when told by carrier"
am: 9afa720abe

Change-Id: I64b6eece29d475d8fdbaf8f6d1fb2c62701fd6e4
2017-12-04 23:45:57 +00:00
Jordan Liu
9afa720abe Merge "Hide signal strength when told by carrier" 2017-12-04 23:20:31 +00:00
Chien-Yu Chen
890c9a7ad3 Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
am: fa3af7b0e7

Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
2017-12-03 03:28:40 +00:00
Chien-Yu Chen
c8d91c6066 Revert "Revert "Settings: Enable HAL HDR+ by default""
am: 24721e7d96

Change-Id: Iec2832d2ae85edb92576af5688a067b88528fb1a
2017-12-03 03:28:03 +00:00
Chien-Yu Chen
7bae205499 Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
2017-12-01 08:11:56 -08:00
Chien-Yu Chen
24721e7d96 Revert "Revert "Settings: Enable HAL HDR+ by default""
This reverts commit 781e762c2c.

Test: CTS
Bug: 67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
Merged-In: I3c1459e432df10d075072e531ef6fc65e3ae4f24
2017-12-01 08:11:44 -08:00
Hemant Gupta
cf2557e8f4 Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE" am: b21a10b2ff
am: a84a535729

Change-Id: Ia8ed56e2da6641a107af912efdf497d90c0d43ed
2017-11-30 17:43:08 +00:00
Hemant Gupta
a84a535729 Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
am: b21a10b2ff

Change-Id: Id0378b1c410afcc0566652e3308cd812dcd68470
2017-11-30 17:40:31 +00:00
Hemant Gupta
5b84cfae44 Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE
Step by step:
1. Pair and connect with BTHS (e.g. SBH50).
2. Click the settings icon of paired device, and check "Use for" items.
-----------------------------------------------------------------
Expected Result:
After step 2, "Contact sharing" should not be checked.

Actual Result:
After step 2, "Contact sharing" is checked.

Fix:
Set phone book permission as REJECTED if class of Device is
not AUDIO_VIDEO_HANDSFREE

Test: Checked above usecase and issue is not observed

Bug: 64372703
Change-Id: I178a09dd9e76d67c461c4b04d9b2ee0078ed24c9
2017-11-29 20:37:05 +00:00
Patrik Bannura
5a84add99f Hide signal strength when told by carrier
Bug: 69730732
Test: Add different values for two carriers in vendor.xml
and see them change when swapping sim card
Depends-On: I155c8f619a451edab85cf6422cef73e8e1686629
Change-Id: I241ddb3c20002db781308d94c6c165b8d13b2474
2017-11-29 12:18:49 +00:00
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