Commit Graph

55608 Commits

Author SHA1 Message Date
Bonian Chen
661f006bb2 Merge "[Settings] Add owners to support network part" 2019-12-23 05:57:59 +00:00
Bonian Chen
2f5ad9cb4d Merge "Retrieve EID from each card" 2019-12-23 05:53:14 +00:00
Bonian Chen
a0b942a6f4 [Settings] Add owners to support network part
Add more owners to support network part.

Bug: none
Test: none
Change-Id: I3fa0a72e75aace65887c461204fd9a33bd8fee13
Merged-In: Ic2820bc113bc26fc0d162c42c7925477177127ae
2019-12-23 12:40:07 +08:00
Automerger Merge Worker
4b7659a1ef Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" am: 990b0527aa am: c9e4e0b881
Change-Id: I8ea4f4ec0781ebb28b3aeb0681123d9d1e8ba69b
2019-12-23 03:50:58 +00:00
Zoey Chen
c9e4e0b881 Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API"
am: 990b0527aa

Change-Id: I04c6d51db223bbdbcb18007e77c75103aed150ba
2019-12-22 19:35:11 -08:00
Zoey Chen
990b0527aa Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 2019-12-23 03:33:35 +00:00
Bonian Chen
6435164abf [Settings] Replace Robolectric#setupActivity()
Avoid from accessing Robolectric#setupActivity().

Bug: 140707056
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EuiccPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ApnPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I8552b181d2dc1c9a5d8aeb0b7e79bbec7252f67e
2019-12-23 03:08:25 +00:00
Automerger Merge Worker
737783d5e4 Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f
Change-Id: Ib6869f626d9cb5f085ab77c150e245dec904b6fb
2019-12-23 02:51:48 +00:00
Bonian Chen
fb72a1094f Merge "[Settings] Replace TelephonyManager#from()"
am: 19cebd9eca

Change-Id: Id5539c4177dbf5dec92add4e1150d6beea4907e5
2019-12-22 18:42:08 -08:00
Bonian Chen
19cebd9eca Merge "[Settings] Replace TelephonyManager#from()" 2019-12-23 02:40:01 +00:00
Bonian Chen
228dd34a8a [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaListPreferenceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSubscriptionPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CdmaSystemSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AutoSelectPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=OpenNetworkSelectPagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EnabledNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=PreferredNetworkModePreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SettingsDumpServiceTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataPreferenceControllerTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkSettingsTest
Change-Id: If78ad37d4795d615b6f8db2f5687a28792a6764f
2019-12-23 01:00:38 +00:00
Automerger Merge Worker
c547fc78c7 Merge "Create some strings for RTT setting" into qt-qpr1-dev am: 1cdbed55f9
Change-Id: I8ddf92c23c00c7b2958dbefdf5483e2b609e92c3
2019-12-21 02:34:00 +00:00
TreeHugger Robot
1cdbed55f9 Merge "Create some strings for RTT setting" into qt-qpr1-dev 2019-12-21 02:20:47 +00:00
Automerger Merge Worker
925e9771ea Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev am: 12510978c3
Change-Id: I0808583341d6f2a867dfa47cf08e7f529e3b0571
2019-12-20 18:25:50 +00:00
TreeHugger Robot
12510978c3 Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev 2019-12-20 18:11:29 +00:00
Tsung-Mao Fang
0f7b65b512 Create some strings for RTT setting
Test: Rebuild
Bug: 146540478
Change-Id: I26f218caba46273796e52c244c9f022742f0bdeb
Merged-In: I26f218caba46273796e52c244c9f022742f0bdeb
2019-12-20 16:03:27 +00:00
Automerger Merge Worker
17bc83209f Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd
Change-Id: I9f59dac9b64f2cb0acf31448c10cb0ef5c04da62
2019-12-20 15:35:13 +00:00
TreeHugger Robot
bc96cf54cd Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev 2019-12-20 15:23:53 +00:00
Automerger Merge Worker
4b6beab35e Remove permission bar chart in Privacy setting am: 8e58e2c7a5
Change-Id: Id55e0078ce0eccc85a0ef15706ba07b26da5c3ab
2019-12-20 10:31:03 +00:00
Sunny Shao
5f42f2f7a7 Update the behavior of the Dark theme slice
- Dark theme slice disappear when battery saver is ON.

Bug: 146149658
Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I071014d7f0658db2098e353717afda905f162ecd
2019-12-20 13:25:49 +08:00
Automerger Merge Worker
36eb9829d5 Merge "Use floats for face enrollment dimensions" am: 59baff6ef9 am: fd493b221a
Change-Id: Ia4ac6e428666fb82f39e6b43620623e141f716c0
2019-12-20 03:18:56 +00:00
Ilya Matyukhin
fd493b221a Merge "Use floats for face enrollment dimensions"
am: 59baff6ef9

Change-Id: I36f7d8bb13e6eb14c76d0a87dcb1db1a48819c17
2019-12-19 19:01:55 -08:00
Treehugger Robot
59baff6ef9 Merge "Use floats for face enrollment dimensions" 2019-12-20 02:35:40 +00:00
Ilya Matyukhin
ad1b76ce3b Use floats for face enrollment dimensions
Test: compiles and runs correctly on a device
Change-Id: I64cb905b06aa2ca2b0703d83ed9a495c7a85cf94
2019-12-19 17:21:04 -08:00
Automerger Merge Worker
d21a3207ef Merge "Add 5G RAT into Bearer field." am: 5f6a4b1dae am: 3350d4d05d
Change-Id: If6bb822fa55a0c477172348ea7dc10112c3b36df
2019-12-19 12:24:22 +00:00
Daniel Huang
3350d4d05d Merge "Add 5G RAT into Bearer field."
am: 5f6a4b1dae

Change-Id: I1921fa9611b2222228667bd55e6ac4df5b19a83a
2019-12-19 04:08:08 -08:00
zoey chen
d7eb8113c7 [Settings] Remove usage of TelephonyManager getDefault() hidden API
Bug: 146537234
Test: make
Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d
Mergde-In: I818848b0ae323efe8b890cde9d9819d9a606f96d
2019-12-19 19:45:59 +08:00
Daniel Huang
5f6a4b1dae Merge "Add 5G RAT into Bearer field." 2019-12-19 11:24:41 +00:00
danielwbhuang
db59528d84 Add 5G RAT into Bearer field.
Within APN editor, 5G RAT need to be added into Bearer field.

Bug: 143995814
Test: 1. Build pass.
      2. make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest
      3. check UI:
      3-1. Open APN settings page: Settings > Network & Internet > Mobile Network > Advanced > Access Point Names.
      3-2. Click the 3 dots at the up corner, and then select "New APN" > "Bearer"

Change-Id: If09afd00cf7860c3bbb40be748ca04c9a55ee5b8
2019-12-19 17:17:10 +08:00
Tsung-Mao Fang
8e58e2c7a5 Remove permission bar chart in Privacy setting
- Because permission hub is already postponed,
we don't need to show this UI in privacy settings.

Test: Rebuild, visual, robotest
Change-Id: I51aca52bc605a3c6b0cafc084e8e491c280d770f
Fix: 143447873
Merged-In: I51aca52bc605a3c6b0cafc084e8e491c280d770f
(cherry picked from commit ab914adc00)
2019-12-19 16:51:58 +08:00
Sunny Shao
a74060c1b7 Add Tapjacking Protection for SettingsHomepageActivity
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from
SettingsHomepageActivity and SettingsPanelActivity with lifecycle.

Bug: 138442483
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
      manual test
Change-Id: I72f9a947f57f74a8c09127d6c39173594c248ddc
Merged-In: I72f9a947f57f74a8c09127d6c39173594c248ddc
2019-12-19 02:59:10 +00:00
Automerger Merge Worker
f424190715 Merge "Fixes sound panel create multiple SoundSettings activity" am: e45a8aadd4 am: 3999464409
Change-Id: I2b5875e2c79daf6e5b7173da59b33e2cfcfbad6e
2019-12-18 12:25:43 +00:00
Raff Tsai
3999464409 Merge "Fixes sound panel create multiple SoundSettings activity"
am: e45a8aadd4

Change-Id: I20e5dd44471df7a25bd50e0bafdf040cf9b04134
2019-12-18 04:09:49 -08:00
Treehugger Robot
e45a8aadd4 Merge "Fixes sound panel create multiple SoundSettings activity" 2019-12-18 12:08:11 +00:00
Raff Tsai
a9e7517f2c Fixes sound panel create multiple SoundSettings activity
- Use FLAG_ACTIVITY_NEW_TASK to prevent activity stack contains
many activites

Fixes: 142231489
Test: 1. Press volume button and click in volume settings button
      2. Press Media Volume to open SoundSettings
      3. Repeat 1, Press Call Volume to open SoundSettings
      4. Repeat 1, Press Alarm Volume to open SoundSettings
      5. Press back, should see volume panel
Change-Id: I87cd75fbd43f77446191ad50ed7a002a2202337f
2019-12-18 18:38:37 +08:00
zoey chen
7ab984b603 [Setting] Use @SystemApi to replace the hidden api
Bug: 145785535
Test: make
Change-Id: I32554eec8e9f0477a7342a8137a32939b5393fad
Merged-In: I32554eec8e9f0477a7342a8137a32939b5393fad
2019-12-18 17:41:02 +08:00
Automerger Merge Worker
268595f26a Merge "[Settings] Create a proxy for SubscriptionManager" am: b2380eaaee am: 73e6ec3231
Change-Id: Iafb4bf54ea21d88867b675bb71bf7eb1fec5bf06
2019-12-18 09:21:56 +00:00
Bonian Chen
73e6ec3231 Merge "[Settings] Create a proxy for SubscriptionManager"
am: b2380eaaee

Change-Id: Ib66ad2735d01dc3f918ffbd133fcbe5d006bb85f
2019-12-18 01:07:43 -08:00
Bonian Chen
b2380eaaee Merge "[Settings] Create a proxy for SubscriptionManager" 2019-12-18 09:04:53 +00:00
Yoshiaki Naka
81dbc00b6e Retrieve EID from each card
Each eUICC has its own EID. The same EID retrieved from the default
eUICC shall not be displayed for all the SIM status dialogs when the
device supports multiple UICCs.

Bug: 141256483
Test: Manual and SimStatusDialogControllerTest

Change-Id: I367ae3a5f97ff92e03312bed6fe37727ae3798ab
2019-12-18 17:57:47 +09:00
Automerger Merge Worker
a07760377e Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev am: 30bf9e2e5e
Change-Id: Iacdac6e3fc2f8ba03f5cd3a590f52c5c990e1226
2019-12-18 06:27:02 +00:00
android-build-team Robot
6b7081154a Merge cherrypicks of [9943992, 9944684, 9944054, 9943993, 9944476, 9942363, 9942364, 9942365, 9942367, 9944685, 9944686, 9943217, 9944762, 9944764, 9944481, 9944411, 9944055, 9944056, 9944057] into qt-qpr1-release
Change-Id: I79028754f4eb72b297e36d3bb43927d98b652e52
2019-12-18 06:24:31 +00:00
Mill Chen
36bbb02dca Prevent accounts page directly opening in screen pinning mode
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab35)
(cherry picked from commit a545a85f9d)
2019-12-18 06:24:03 +00:00
Kevin Chyn
30bf9e2e5e Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev 2019-12-18 06:15:58 +00:00
joshmccloskey
2e57bc47b2 Added horizontal seperator in Face Settings
Test: Manual.
Bug: 140965037
Change-Id: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
Merged-In: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
2019-12-18 04:54:27 +00:00
Automerger Merge Worker
98a0e0ec96 Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev am: 5b71fccabd
Change-Id: If7bce1789dd81d3f77766fd9ed71dbc6738fb857
2019-12-18 02:46:11 +00:00
TreeHugger Robot
5b71fccabd Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev 2019-12-18 02:27:28 +00:00
Automerger Merge Worker
0ed1383af2 Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" am: ecce39622d am: 2be27a8d81
Change-Id: Ia5c3e5043d885812fa013caa7b0786819ec81e5c
2019-12-18 01:53:32 +00:00
SongFerng Wang
2be27a8d81 Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech"
am: ecce39622d

Change-Id: I4eb6b4e980a13b5b6fc164b7f7edbd7b9fb059d3
2019-12-17 17:41:21 -08:00
SongFerng Wang
ecce39622d Merge "[mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech" 2019-12-18 01:36:08 +00:00