Commit Graph

27869 Commits

Author SHA1 Message Date
Automerger Merge Worker
cd46f2df4f Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2
Change-Id: I709109c86262dcc6886ccd2dbccf84fbc7188650
2019-12-27 02:58:25 +00:00
Bonian Chen
b0bddfec15 Merge "[Settings] Replace getSimCount() API" 2019-12-27 02:45:42 +00:00
Automerger Merge Worker
a58c7ba27a Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3 am: 8ead010c08
Change-Id: I558dad7bbc41bc1dc30a72665da0d96e263e67ed
2019-12-26 14:15:29 +00:00
Zoey Chen
e8cf63ddd3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 13:44:58 +00:00
Automerger Merge Worker
b206208982 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c
Change-Id: I2489531d3b940c6de8ad0805fc138a66b1607ba2
2019-12-26 13:11:36 +00:00
Zoey Chen
47634431c6 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" 2019-12-26 12:01:22 +00:00
Bonian Chen
b373aeedfe [Settings] Replace getSimCount() API
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().

Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Change-Id: If50c57e7c1b27f9a0baf2bd46cc0930e0a0be2bd
2019-12-26 19:02:57 +08:00
Automerger Merge Worker
3d73b7a832 Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9 am: 3835293aea
Change-Id: I9750d2b07e3b6280d2e3e9e2779f2740d24f0cdf
2019-12-26 09:55:38 +00:00
Zoey Chen
047dd2dff9 Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" 2019-12-26 09:36:58 +00:00
zoey chen
fc3ddb2f16 [Settings] Replace #getServiceStateForSubscriber with #getServiceState
Bug: 146821501
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
2019-12-26 17:12:42 +08:00
Automerger Merge Worker
631a1d206c Merge "[Settings] Replace #getSimCount with #getActiveModemCount" am: 171eabcb2d am: 22c2c14605
Change-Id: Ic45f318e6784205e88a13f8a2fdf7fcdb04c9955
2019-12-26 04:17:42 +00:00
Automerger Merge Worker
c5d575f085 Merge "[Settings] Replace TelephonyManager#from()" am: 98e6ab358b am: 4be4ae6a75
Change-Id: Ie2daa594c252d71e63125108036a4428563bed5b
2019-12-26 04:17:28 +00:00
Zoey Chen
171eabcb2d Merge "[Settings] Replace #getSimCount with #getActiveModemCount" 2019-12-26 03:44:47 +00:00
Bonian Chen
98e6ab358b Merge "[Settings] Replace TelephonyManager#from()" 2019-12-26 03:36:09 +00:00
zoey chen
5b336b1bd9 [Settings] Replace #getSimCount with #getActiveModemCount
Bug: 146815553
Test: make
Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
Merged-In: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
2019-12-25 16:30:25 +08:00
zoey chen
ac92bab305 [Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId
Bug: 146823458
Test: make
Change-Id: I437a6e325112bf9d031a4eb11c28cb755c085bee
Merged-In: I437a6e325112bf9d031a4eb11c28cb755c085bee
2019-12-25 16:27:00 +08:00
zoey chen
f74850d559 [Settings] Replace #getSubscriberId(I) with #getSubscriberId()
Bug: 146823314
Test: make
Change-Id: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
Merged-In: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
2019-12-25 16:23:16 +08:00
Automerger Merge Worker
b8a6b088b3 Merge "[Mainline] Remove unused UiccController object" am: e29ca94af4 am: 0c7ec95f35
Change-Id: Ib32da629e9c227cd92e013527e04eb345fa63732
2019-12-25 03:16:37 +00:00
Treehugger Robot
e29ca94af4 Merge "[Mainline] Remove unused UiccController object" 2019-12-25 02:54:20 +00:00
changbetty
b7c8404317 [Mainline] Remove unused UiccController object
Bug: 146842199
Test: make
Change-Id: I35f86ee24c0db2599924fb470537b860c9d08390
2019-12-25 02:50:01 +00:00
Automerger Merge Worker
7f659062a5 Merge "[Setting] Use @SystemApi to replace the hidden api" am: e74208c831 am: 7ec7514f1e
Change-Id: I9779621d46ba83975bcd552b7b36939d934110bf
2019-12-24 11:15:42 +00:00
Zoey Chen
e74208c831 Merge "[Setting] Use @SystemApi to replace the hidden api" 2019-12-24 10:58:34 +00:00
Automerger Merge Worker
857267b1e8 Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" am: 6bba42fb40 am: 27c52d5e76
Change-Id: I12080d93b39b990083f3ac795b7e4ae42ffcbe8d
2019-12-24 09:14:23 +00:00
Bonian Chen
67f7ab3f2b [Settings] Replace TelephonyManager#from()
Replacing TelephonyManager#from() by public API.

Bug: 146752167
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=EuiccPreferenceControllerTest
Change-Id: I8f6e8bc57c20782540f8b26bdeb163d881e70a2e
2019-12-23 15:44:52 +08:00
Automerger Merge Worker
4af546197b Merge "[Settings] Add owners to support network part" am: 661f006bb2 am: 0ed7376449
Change-Id: I480f8f481e200c3c551e621ba52e435c4fb0cf5b
2019-12-23 06:22:32 +00:00
Automerger Merge Worker
0988f8cfec Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f
Change-Id: Iee9c974eef13599eebc4dfd82f7fbc5f10e7ca58
2019-12-23 06:21:54 +00:00
SongFerngWang
d6bc6dee08 Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs
- telephonymanager set subid by createForSubscriptionId
  -getDataNetworkType(I)
  -getVoiceNetworkType(I)
  -getSimSerialNumber(I)
  -getServiceStateForSubscriber(I)
- copy getNetworkTypeName() to SimStatusDialogController

Bug: 143998492
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER\
      =SimStatusDialogControllerTest

Change-Id: Ieb8547496a4b0da7332abd227056f9b786c7ef6a
2019-12-23 14:12:56 +08:00
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
990b0527aa Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API" 2019-12-23 03:33:35 +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
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
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
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
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
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
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
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
b2380eaaee Merge "[Settings] Create a proxy for SubscriptionManager" 2019-12-18 09:04:53 +00:00