Commit Graph

46062 Commits

Author SHA1 Message Date
Risan
e613923d66 Merge "Allow StubVolume to be browseable in Settings"
am: 8f516adef7

Change-Id: Idddb5b90367bbb5c1f1a5146fdd7b1fc01cf0cf9
2018-11-13 11:45:08 -08:00
Treehugger Robot
8f516adef7 Merge "Allow StubVolume to be browseable in Settings" 2018-11-13 19:20:38 +00:00
Neil Fuller
78e132773a Merge "Remove the feature flag and dead code for the old time zone picker"
am: 6bb4b5ca43

Change-Id: If338977d818193950ed428b70ed6d6a3aa87082b
2018-11-13 01:50:08 -08:00
Neil Fuller
6bb4b5ca43 Merge "Remove the feature flag and dead code for the old time zone picker" 2018-11-13 09:33:16 +00:00
Victor Chang
fe627a5901 Remove the feature flag and dead code for the old time zone picker
This commit backports commit 6be6c58206
to aosp/master.

Bug: 72376227
Test: build only
Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
(cherry picked from commit 6be6c58206)
2018-11-13 07:49:32 +00:00
Fan Zhang
4220b1e50c Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-13 09:22:06 +08:00
Edgar Wang
96d829be9a Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev 2018-11-13 01:16:48 +00:00
Fan Zhang
73469d9de1 Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 20:25:51 +08:00
Fan Zhang
04f1e38dc3 Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 19:52:32 +08:00
Edgar Wang
bea5b289ff Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
Merged-In: I0a0f03bdb27d9eea48eb758496eefeebcbc57b6c
Change-Id: If839a7199992104cc0abac9327844145d148cd68
Fixes: 118168552
Test: robotests
2018-11-09 11:24:48 +08:00
Youming Ye
6b0237ebfb Merge "Fix issue that read-only apns can be edited"
am: e871464053

Change-Id: Iab9783bfc462e5232df260f701c8f05e099bf55e
2018-11-08 17:20:26 -08:00
Youming Ye
e871464053 Merge "Fix issue that read-only apns can be edited" 2018-11-09 01:00:35 +00:00
Risan
9deece9086 Allow StubVolume to be browseable in Settings
Test: Unit test + manual test: Mount and unmount stubvolume in ARC++,
check settings show the device correctly and could browse it using
DocumentsUI.
Bug: 110380403

Change-Id: I96fc82e731225776ac7070ef035687f83da94245
2018-11-08 21:47:22 +00:00
android-build-team Robot
589539103c Snap for 5117340 from 0eea3b6c9e to pi-qpr2-release
Change-Id: Ie37868f13ec5507a77ea14ec542e3677912edc0b
2018-11-08 01:11:46 +00:00
Fan Zhang
0eea3b6c9e Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev 2018-11-07 20:44:59 +00:00
Clown SHEN
74fe4a9177 Merge "Launch WfcActivation with subscription ID"
am: bd57f94a4c

Change-Id: Id76cb09a81158ce069f5200b99c19b1c9840f9f8
2018-11-06 23:30:23 -08:00
Clown SHEN
bd57f94a4c Merge "Launch WfcActivation with subscription ID" 2018-11-07 07:09:27 +00:00
android-build-team Robot
6a2725ba18 Snap for 5115288 from 222dca5b7c to pi-qpr2-release
Change-Id: Ied0d2683aa566fae94e0b0684a872b7dcaab3f4d
2018-11-07 04:16:35 +00:00
Fan Zhang
d9c6692f25 Fix crash when starting daydream setting with wrong context
The context must be a UI context. This is a new requirement in P.

Change-Id: I3e2de5068f44010da7d57af030e9f029dd97a7f8
Merged-In: I28874f296da617f4cedf6706b0663b76671f1780
Fixes: 111375261
Fixes: 113312592
Test: robotests
2018-11-06 23:47:24 +00:00
Bill Yi
222dca5b7c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie15195c81e11f67f4bd72be18c6af0d273666ceb
2018-11-06 04:15:12 -08:00
Bill Yi
935509aa3d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic830e9dc65c715010b562f0148821899114de819
2018-11-02 15:27:05 -07:00
Yuming Mao
8d1eee08f7 Fix issue that read-only apns can be edited
When entering to ApnEditor with ApnSettings#onPreferenceTreeClick(),
subId is not passed.
So invalid subId is used and it gets wrong carrier config values.

To resolve this issue, remove unnecessary ApnSettings click event.
The only click event for launching ApnEditor is ApnPreference click
event.

Test: manual - Check that the read-only APN can't be edited when tap
the edge of the APN settings screen
Bug: 117302653
Change-Id: I0a61b409539d6e4f6aa9860235e61c43c76640fa
2018-11-02 19:56:11 +09:00
clownshen
95f8c6e96a Launch WfcActivation with subscription ID
For multi SIM project, need to have subscription ID information in the
intent for launching WFC activation activity.

Bug: 112826472
Test: manual test
Change-Id: I9f470c014054efa612c87ff16e574fc9fd286b3d
2018-10-31 13:28:09 +08:00
android-build-team Robot
36cdfcf838 Snap for 5101444 from 7849607a7c to pi-qpr2-release
Change-Id: I0f8379a2470ce61035c289a5c1f84f5675423501
2018-10-31 03:05:05 +00:00
Lei Yu
7849607a7c Merge "Add entitlement check for usb tethering" into pi-dev 2018-10-25 19:58:53 +00:00
Bill Yi
27e14db009 [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 8b16aba0dd  -s ours

Change-Id: I6072677fc094b42e0a1356aa440151f829e100a0
2018-10-24 16:31:58 -07:00
Bill Yi
8b16aba0dd Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
2018-10-24 14:47:27 -07:00
Bill Yi
851a72f941 Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: Ia33547dfec9adf4000d3ed2665f2c3804be97071
2018-10-24 09:07:12 -07:00
android-build-team Robot
179a790b27 Snap for 5087486 from f896493c70 to pi-qpr2-release
Change-Id: Ie5e1b60eb209ae6b6d74660120f278a8dd626d72
2018-10-24 03:10:14 +00:00
Fan Zhang
c150f5eb29 Merge "Fix toast is covered by PIN code screen after wrong pin"
am: d5abc0eb44

Change-Id: Ie2cfeeb5573ae6b79855edbd87210bfe0e0a8287
2018-10-23 19:24:29 -07:00
Fan Zhang
d5abc0eb44 Merge "Fix toast is covered by PIN code screen after wrong pin" 2018-10-24 02:16:57 +00:00
Hao Zhao
754930bc50 Fix toast is covered by PIN code screen after wrong pin
The error toast is displayed when user input wrong PIN
code three times, but at that moment the SIM PUK code input
page in SystemUI pop up and covers the toast, so the user
can't seen the error message.

Adjust the toast window layer, let the the toast pop up
over the SIM pin code input page.

Bug: 74056527
Change-Id: I569a2fc2adac15c4713b4c95e9720335bd4df88a
2018-10-24 06:39:45 +09:00
Doris Ling
03fb1a93ca DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.

Change-Id: I0fa8e3c9e02090d7d8a3e18608181ab73d2f46a1
Fixes: 118315852
Test: manual
2018-10-23 18:36:47 +00:00
Bill Yi
89e733ee2c Merge pi-dr1-dev to aosp-master
am: c1fe9e6ac2

Change-Id: I6a6eafb34b31bc343dfe4117f17ccba771a7f111
2018-10-19 15:00:40 -07:00
Bill Yi
c1fe9e6ac2 Merge pi-dr1-dev to aosp-master
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c
2018-10-19 12:20:48 -07:00
Hall Liu
e419904aa0 Merge "Start using CarrierConfig for 4G/LTE icon"
am: 558535f3f2

Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
2018-10-18 14:56:56 -07:00
Hall Liu
558535f3f2 Merge "Start using CarrierConfig for 4G/LTE icon" 2018-10-18 20:36:06 +00:00
Stanley Tng
81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-17 18:14:27 +00:00
Treehugger Robot
b0e99e1472 Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +00:00
Bill Yi
f896493c70 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
2018-10-17 04:32:19 +00:00
android-build-team Robot
63fc0e97d4 Snap for 5073521 from 2a1a5cba81 to pi-qpr2-release
Change-Id: I7676645f9b82d782fda8fb59cdb3ab2e032576a5
2018-10-17 03:15:05 +00:00
Stanley Tng
a8af2d3664 resolve merge conflicts of 019a771d2d to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
jackqdyulei
820e22d324 Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API

Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.

Bug: 115707279
Test: RunSettingsRoboTests
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-15 16:58:21 -07:00
Treehugger Robot
019a771d2d Merge "Add Feature Flag for Hearing Aid Profile" 2018-10-15 23:10:41 +00:00
Stanley Tng
a6c927b51a Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-15 22:51:02 +00:00
Bill Yi
2a1a5cba81 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
2018-10-15 12:34:57 -07:00
Youming Ye
8bac59265e Merge "Fix error message shown when SIM PIN enable/disable fails"
am: f29392303a

Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414
2018-10-15 10:42:52 -07:00
Youming Ye
f29392303a Merge "Fix error message shown when SIM PIN enable/disable fails" 2018-10-15 17:08:22 +00:00
Bill Yi
ebb0bbe3f7 Import translations. DO NOT MERGE
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
2018-10-15 01:55:17 -07:00
Stanley Tng
a4fc23140a Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116725094
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit 068c2547f6)
2018-10-13 16:21:15 -07:00