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
Sarah Chin
f123f98510
Handle 5G meteredness in telephony framework
...
Edit onSubscriptionOverride method for NetworkPolicyListener
Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Change-Id: Ided2e445d3758ebc6c4f4df63145f61f9a56f64e
Merged-In: Ided2e445d3758ebc6c4f4df63145f61f9a56f64e
(cherry picked from commit 2136bc92fe )
2019-12-17 23:16:19 +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
Automerger Merge Worker
34c41cdadb
[DO NOT MERGE] Add country blacklist support am: d4420d4ce4
...
Change-Id: I2924df987a2a0efc9e4f9f9f2e2fd838ed01f19d
2019-12-16 21:54:11 +00:00
Alex Lin
58bffb7f71
Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev
2019-12-16 21:34:45 +00:00
Alex Lin
62487aed51
Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev-plus-aosp
2019-12-16 21:34:45 +00:00
Automerger Merge Worker
0419bccadc
Merge "[Settings] Remove access of TelecomManager.from()" am: 90544355cd am: 0871f6bc97
...
Change-Id: I992dfff13cca63e070a74066a78b53fb8fefe01d
2019-12-16 14:23:54 +00:00
Bonian Chen
0871f6bc97
Merge "[Settings] Remove access of TelecomManager.from()"
...
am: 90544355cd
Change-Id: I4fe4009ffd33e2610d0c4bc8382ae8534c07a661
2019-12-16 06:12:53 -08:00
Treehugger Robot
90544355cd
Merge "[Settings] Remove access of TelecomManager.from()"
2019-12-16 13:04:24 +00:00
Bonian Chen
3a96d214d3
[Settings] Remove access of TelecomManager.from()
...
Replace TelecomManager.from() into public API access.
Bug: 146187127
Test: build pass
Change-Id: Id9fa32063a9a7ea5b9107315e50330fa5eca41b7
2019-12-16 08:48:05 +00:00