joshmccloskey
ab5bf98c03
Added mandatory scrolling for FaceIntroduction
...
am: af1e831ab7
Change-Id: I1877ce4650fd393d08e2ff1c15944df8fbd4d6d7
2019-09-25 10:58:00 -07:00
joshmccloskey
af1e831ab7
Added mandatory scrolling for FaceIntroduction
...
Test: Verified in SUW/Settings user must scroll through contents in
order to go to the next screen.
Bug: 141380294
Change-Id: I483ab6ae6a282c81ba2f2c4d1d9d1f21c6cb9453
2019-09-25 00:23:59 +00:00
Daniel Huang
f7b4dc1dc7
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb777530 am: f28625bcf1
...
am: 1fec213233
Change-Id: Ifed2aeb3759051ce1ddc490fb695b50642b76402
2019-09-24 02:45:00 -07:00
Daniel Huang
1fec213233
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb777530
...
am: f28625bcf1
Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
2019-09-24 02:39:02 -07:00
Daniel Huang
f28625bcf1
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
...
am: 51cb777530
Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
2019-09-24 02:32:29 -07:00
Daniel Huang
51cb777530
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
2019-09-24 09:21:51 +00:00
Yi-Ling Chuang
3b8a14e86f
Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc am: 8d8c3e19b5
...
am: b26711944b
Change-Id: I0edf1eff42cf54e644e60a11ba97219c38891e93
2019-09-22 20:16:25 -07:00
Yi-Ling Chuang
b26711944b
Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc
...
am: 8d8c3e19b5
Change-Id: I8fae05f98c2ad04e0d7fba7a2aa409c08f781c0b
2019-09-22 20:09:51 -07:00
Yi-Ling Chuang
8d8c3e19b5
Merge "Enable dismissal feature on legacy suggestions."
...
am: ee39335edc
Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
2019-09-22 20:03:21 -07:00
Edgar Wang
18839c1fbc
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
...
am: 07ea1dc815
Change-Id: Ia7f62e46c3c9d7c9b7a55686be911891764ff75d
2019-09-21 02:07:52 -07:00
Edgar Wang
07ea1dc815
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
2019-09-21 08:54:47 +00:00
Yi-Ling Chuang
83ac0efd81
Enable dismissal feature on legacy suggestions.
...
Add back the close button for legacy suggestions.
Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
2019-09-20 18:03:10 -07:00
Edgar Wang
c3a9fff980
Handle Aware sensor status for Always On
...
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings
Bug: 136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
2019-09-21 02:08:36 +08:00
苗苗 (Miao Miao)
9f4a65c893
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's
...
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information
EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information
Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug: 141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
2019-09-20 18:13:30 +08:00
Bonian Chen
3cce668981
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
...
am: 20290d0451
Change-Id: I0b3cb958eff31ede7daa3292987684c26e9111d5
2019-09-19 13:25:31 -07:00
Bonian Chen
20290d0451
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
2019-09-19 20:07:20 +00:00
Bonian Chen
fad5a00b84
[Help Page] Support help content under 2 CDMA SIM
...
Fix the design for displaying help content.
Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.
Bug: 139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
2019-09-18 22:20:25 +00:00
Neil Fuller
ac3d9d8641
Merge "Remove use of deprecated Time class" am: b3f8696c4d am: b83ddefb5c
...
am: 42b55bc6f6
Change-Id: I69ea913c7596017ab2d08dfe67c8376527d01603
2019-09-17 10:17:41 -07:00
Neil Fuller
42b55bc6f6
Merge "Remove use of deprecated Time class" am: b3f8696c4d
...
am: b83ddefb5c
Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
2019-09-17 10:06:03 -07:00
Neil Fuller
b83ddefb5c
Merge "Remove use of deprecated Time class"
...
am: b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
2019-09-17 09:56:45 -07:00
Neil Fuller
4c77d00e34
Remove use of deprecated Time class
...
Remove a use of the deprecated Time class.
Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
2019-09-17 13:53:17 +01:00
Mady Mellor
eac42583a1
Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
2019-09-16 21:55:52 +00:00
Ilya Matyukhin
4dfe356797
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
...
am: 3df43a3eae
Change-Id: Iaeaedcde2e27f07cb5849a2cf670219fd143b934
2019-09-13 02:28:52 -07:00
Ilya Matyukhin
3df43a3eae
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
2019-09-13 09:10:32 +00:00
Ilya Matyukhin
a95459c640
Fix "skip lock screen" not working for a secondary user
...
Bug: 140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
2019-09-13 09:10:15 +00:00
cosmohsieh
7aee812888
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
...
am: 17cbea0112
Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834
2019-09-12 14:09:30 -07:00
TreeHugger Robot
17cbea0112
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
2019-09-12 20:49:56 +00:00
Arc Wang
40f22313dc
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
...
am: ec3055b9eb
Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
2019-09-12 01:14:57 -07:00
TreeHugger Robot
ec3055b9eb
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
2019-09-12 08:05:21 +00:00
Mady Mellor
91ba8e9b66
qt-r1-bubbles-dev @ build 5835883
...
Test: presubmit setup on source branch
Bug: 129158983
Bug: 136034310
Bug: 137876221
Change-Id: I5ade70c2101d09eed4698ce29bd3242483ec7f8b
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Merged-In: I58f0287ed99a4daf3758316e4004bca05f17b0d1
2019-09-11 22:42:17 +00:00
Mady Mellor
88de4328fd
Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp
2019-09-11 22:40:20 +00:00
joshmccloskey
56e312b2a3
Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50
...
am: 349e664035
Change-Id: Iad6b5b3e8a637b910227d5cba56e09c8f075d4be
2019-09-09 23:26:12 -07:00
joshmccloskey
006edb1f6d
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
...
am: ff01d52d50
Change-Id: Idcddf14e8aa3cfcd50b78ed112d51bf06424b840
2019-09-09 23:20:26 -07:00
joshmccloskey
349e664035
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
...
am: ff01d52d50
Change-Id: I08e856f94da8ac0b1151d61e8717088672852f6a
2019-09-09 23:20:15 -07:00
TreeHugger Robot
ff01d52d50
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
2019-09-10 06:02:39 +00:00
joshmccloskey
d98257bae6
Change cancel button type to skip for SUW
...
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes: 140702414
Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
2019-09-09 16:46:03 -07:00
Mady Mellor
ea79e343f0
qt-r1-bubbles-dev @ build 5835883
...
Test: presubmit setup on source branch
Bug: 129158983
Bug: 136034310
Bug: 137876221
Change-Id: I58f0287ed99a4daf3758316e4004bca05f17b0d1
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
2019-09-09 21:48:54 +00:00
Raff Tsai
6f8797f86c
Fix Settings crash when click uninstall button
...
am: 2d709131ba
Change-Id: I1e6228b5e4ecf10aa58bd41d2d8019b3d727b935
2019-09-06 01:47:19 -07:00
Raff Tsai
2d709131ba
Fix Settings crash when click uninstall button
...
When mPackageName is null, mFinish is true. OnResume() doesn't
invoke refreshUI(). It causes uninstall button is still enabled.
The solution is hiding AppButtonsPreference when mFinish is true.
Fixes: 138524326
Test: make RunSettingsRoboTests ROBOTEST_FILTER
Change-Id: I9759e53f002afbd4c88d8d536df3bf01c343135e
(cherry picked from commit 88228c3399 )
2019-09-06 05:24:12 +00:00
Joshua Mccloskey
0ec126ead9
Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad
...
am: 820c723e59
Change-Id: Ib3f4d6c66e1cbe2dbdda9b8ae1bbf8ace74877dd
2019-09-05 16:10:01 -07:00
Joshua Mccloskey
cbeeed9942
Merge "Modified text to cancel enrollment" into qt-r1-dev
...
am: fde49ec3ad
Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
2019-09-05 16:00:59 -07:00
Joshua Mccloskey
820c723e59
Merge "Modified text to cancel enrollment" into qt-r1-dev
...
am: fde49ec3ad
Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
2019-09-05 15:59:59 -07:00
Joshua Mccloskey
fde49ec3ad
Merge "Modified text to cancel enrollment" into qt-r1-dev
2019-09-05 22:44:12 +00:00
joshmccloskey
a55cbf036f
Modified text to cancel enrollment
...
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
2019-09-05 12:23:44 -07:00
Arc Wang
31a79feccd
[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network
...
Should only allow saved network UI initialization for once.
Bug: 140362368
Test: WifiConfigControllerTest
manual:
Manually change EAP method and other security fields for a saved
Wi-Fi neterprise network.
Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
Merged-In: Iddc1dae53849760f43b41b75262358dff6ba09af
2019-09-05 14:57:07 +08:00
cosmohsieh
98690197e6
[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection
...
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.
Bug: 138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Merged-In: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
2019-09-05 14:22:00 +08:00
Jayachandran Chinnakkannu
ddc7dda71b
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: Idfbc3f765fc834ab3cb7e07ec340a98606ce87ad
2019-08-27 00:40:42 -07:00
Jayachandran Chinnakkannu
f51fdf64a9
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7
...
am: b5617b6f21
Change-Id: Ia137a3f3454cff7af7c3aa7195eb89c049fadaf2
2019-08-26 11:39:22 -07:00
Jayachandran Chinnakkannu
b5617b6f21
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: I561ecbcd376ac4be2003e291f5528130673460fd
2019-08-23 20:36:56 -07:00
Jayachandran Chinnakkannu
15a9d54958
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: I2598b482b4630279d47685381ddac9c746fbe12d
2019-08-23 20:31:09 -07:00