Commit Graph

55191 Commits

Author SHA1 Message Date
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
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
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
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
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
SongFerngWang
c13da87416 [mainline] Decouple ServiceState.bitmaskHasTech and getBitmaskForTech
Bug: 146314969
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest

Change-Id: I1e9eeab9d886a2910c7db8b59cfe267c51c5920c
Merged-In: I1600a96a729fc3b555eab5bc80b069663c8eb00a
2019-12-17 12:19:52 +00:00
Automerger Merge Worker
96c32711b8 Merge "Fix volume slider color is not correct" am: d1489d2f1f am: 9bb1c631ae
Change-Id: I66e7bb3c06891d092d6ec4b49372ab977670beee
2019-12-17 09:22:59 +00:00
Raff Tsai
9bb1c631ae Merge "Fix volume slider color is not correct"
am: d1489d2f1f

Change-Id: I6d638ec272cfac5be07e817bbac8c287896fdc4d
2019-12-17 01:04:45 -08:00
Raff Tsai
d1489d2f1f Merge "Fix volume slider color is not correct" 2019-12-17 08:46:46 +00:00
Raff Tsai
37860d4299 Fix volume slider color is not correct
Fixes: 140990940
Test: 1. Switch to dark theme
      2. adb shell am start -a android.settings.panel.action.VOLUME
      3. check volume slider color is identical to color in "Done"
      4. Switch to light theme
      5. adb shell am start -a android.settings.panel.action.VOLUME
      6. Check volume slider color is identical to color in "Done"

Change-Id: If783d5c5f8604a23cfaaa28cf42b916763f9c9e8
2019-12-17 14:34:29 +08:00
Automerger Merge Worker
619d8b3418 Merge "Add feature provider for face unlock" into qt-qpr1-dev am: 8472279900
Change-Id: I3334a10c25af3b5a8ed125495c7012fe46516485
2019-12-17 05:38:36 +00:00
Kevin Chyn
8472279900 Merge "Add feature provider for face unlock" into qt-qpr1-dev 2019-12-17 05:27:01 +00:00
Automerger Merge Worker
1bacc5697b Merge "[Settings] Suspend some test case(s)" am: a70e45b03c am: 9bd271763e
Change-Id: Iecbace1215fa4c150a44cc462c7157bc044250f4
2019-12-17 03:37:08 +00:00
Bonian Chen
9bd271763e Merge "[Settings] Suspend some test case(s)"
am: a70e45b03c

Change-Id: Icaddf7a6f31d938af3f4a748f81c4890dc06fd52
2019-12-16 19:06:42 -08:00
Bonian Chen
a70e45b03c Merge "[Settings] Suspend some test case(s)" 2019-12-17 02:37:15 +00:00
Kevin Chyn
15f241b296 Add feature provider for face unlock
Bug: 146085546

Test: Builds
Change-Id: If5c7d57c12a3f679d81cee22fb94a53fce1de29a
2019-12-16 18:19:20 -08:00
Automerger Merge Worker
1cd39a3fb9 Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev am: 58bffb7f71
Change-Id: I2b25e18e176a7399ce4c7149a87b2014fceecb69
2019-12-16 21:55:09 +00:00