Edgar Wang
677b943ae1
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 3448917d8e
...
am: fc0aec7f1a
2019-08-01 23:13:14 -07:00
Android Build Merger (Role)
1c98867b18
Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070 am: 063cc34713" into qt-qpr1-dev-plus-aosp
2019-08-02 06:01:14 +00:00
Edgar Wang
73ae3701fc
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 063cc34713
2019-08-01 23:00:28 -07:00
Edgar Wang
fc0aec7f1a
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 3448917d8e
2019-08-01 23:00:21 -07:00
Edgar Wang
3448917d8e
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:22 -07:00
Edgar Wang
063cc34713
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
2019-08-01 22:49:22 -07:00
Edgar Wang
8e3b202070
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
2019-08-02 05:38:23 +00:00
Daniel Solomon
638e83263b
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 4c1fa1a5d1
...
am: 2b40b40a95
2019-08-01 14:25:07 -07:00
Daniel Solomon
8884ceecd0
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669 am: 8e699b6ec8
...
am: 442a2b26b4
2019-08-01 14:19:20 -07:00
Daniel Solomon
2b40b40a95
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 4c1fa1a5d1
2019-08-01 13:54:52 -07:00
Daniel Solomon
442a2b26b4
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 8e699b6ec8
2019-08-01 13:53:32 -07:00
Daniel Solomon
8e699b6ec8
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
2019-08-01 13:38:20 -07:00
Daniel Solomon
4c1fa1a5d1
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
2019-08-01 13:37:33 -07:00
TreeHugger Robot
c5fbd7b669
Merge "Settings: change the color mode preview image" into qt-r1-dev
2019-08-01 19:58:47 +00:00
Youming Ye
9c8fe39c91
[automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f am: 84049d217d -s ours
...
am: a427771754b7923f5a3f
2019-08-01 12:02:21 -07:00
Youming Ye
ac52b6f68d
[automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f am: de8c3c5fd3
...
am: 34599f661d31608ace73
2019-08-01 11:57:17 -07:00
Youming Ye
a427771754
[automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f
...
am: 84049d217db7923f5a3f
2019-08-01 11:43:22 -07:00
Youming Ye
34599f661d
Check the missing useHomeWfMode case am: b7923f5a3f
...
am: de8c3c5fd3
2019-08-01 11:41:05 -07:00
Youming Ye
84049d217d
Check the missing useHomeWfMode case
...
am: b7923f5a3f
2019-08-01 11:27:48 -07:00
Youming Ye
de8c3c5fd3
Check the missing useHomeWfMode case
...
am: b7923f5a3f
2019-08-01 11:24:55 -07:00
Sunny Shao
647e49e7cf
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
2019-08-01 23:36:12 +08:00
Raff Tsai
1ebf80446f
Fix arabic language % character in wrong place
...
info.batteryPercentString is applied language format.
We don't need to format it again in BidiFormatter.
Fixes: 136699046
Test: visual
Change-Id: Ie89823c23fd23bd6a9a97821f3062cad4dfb3709
2019-08-01 18:31:13 +08:00
Raff Tsai
71a37d138b
Import RadioButtonPreference from SettingsLib
...
Bug: 138620011
Test: manual, robolectric
Change-Id: I3b8a2be021a1b4a07aae61483f2329b7a5bd4655
2019-08-01 07:16:55 +00:00
Raff Tsai
5939f73740
Fix test case error
...
Bug: 138714772
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.core.codeinspection"
Change-Id: I10ff1983793e1e158eb72e93d838ccda97728084
2019-08-01 12:22:03 +08:00
Edgar Wang
58a5be4401
Add skip lock screen in Notification & security lock screen settings
...
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >
Bug: 138458558
Test: robotest & manual
Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
Antony Sargent
8cb89e9d78
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9 am: e744ee1295
...
am: afb537f589
2019-07-31 17:20:19 -07:00
Bill Yi
d49c3d90f4
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours am: f580528464 -s ours
...
am: f3eb3758eb
2019-07-31 16:43:24 -07:00
Youming Ye
b7923f5a3f
Check the missing useHomeWfMode case
...
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-07-31 16:38:32 -07:00
Antony Sargent
fa99ea7dc6
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9 am: ad2f49f851
...
am: bf2c5ce274
2019-07-31 16:35:58 -07:00
Bill Yi
58ff9ea4d5
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours am: 1ccff0ddc6 -s ours
...
am: 1aef5e268e
2019-07-31 16:26:41 -07:00
Antony Sargent
afb537f589
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
...
am: e744ee1295
2019-07-31 16:24:14 -07:00
Bill Yi
f3eb3758eb
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
...
am: f580528464
2019-07-31 16:07:46 -07:00
Antony Sargent
bf2c5ce274
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
...
am: ad2f49f851
2019-07-31 16:06:59 -07:00
Bill Yi
1aef5e268e
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c -s ours
...
am: 1ccff0ddc6
2019-07-31 16:05:53 -07:00
Antony Sargent
e744ee1295
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
...
am: 4685c785b9
2019-07-31 16:04:54 -07:00
Quang Luong
c2e859edee
Merge "Copy WifiSettings base code into WifiSettings2 without WifiTracker"
2019-07-31 23:03:31 +00:00
Antony Sargent
ad2f49f851
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
...
am: 4685c785b9
2019-07-31 15:56:00 -07:00
Bill Yi
1ccff0ddc6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a690f3c4c
2019-07-31 15:53:52 -07:00
Bill Yi
f580528464
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a690f3c4c
2019-07-31 15:53:13 -07:00
TreeHugger Robot
4685c785b9
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e
Protect entry points to add an eSIM when admin restricted
...
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.
The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.
The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.
Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Daniel Solomon
56574d5924
Settings: change the color mode preview image
...
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
2019-07-31 12:48:23 -07:00
Bill Yi
5a690f3c4c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
2019-07-31 12:09:08 -07:00
Quang Luong
b061428938
Copy WifiSettings base code into WifiSettings2 without WifiTracker
...
Copied main logic from WifiSettings into WifiSettings2, removing
all instances of WifiTracker in preparation of adding WifiTracker2.
Removed:
- WifiDialog (to be added back in)
- Context Menu (to be added back in)
- Leftover SUW code (Next button)
WifiSettings2Test also copied directly from WifiSettingsTest, without
context menu test.
Bug: 70983952
Test: atest WifiSettings2Test
Change-Id: Ie1ef5bf0ca14f5989f4add2165422609f12c2c84
2019-07-31 11:46:15 -07:00
Raff Tsai
a64c7b2698
Merge "Fix Settings crash when click uninstall button"
2019-07-31 01:16:47 +00:00
Quang Luong
48a8fbbd9c
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f am: 815af2ba6e
...
am: 89a61d9374
2019-07-30 17:41:23 -07:00
Quang Luong
a5c8edb46f
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f am: 5c4a0e3444
...
am: b66a8c86a4
2019-07-30 17:37:41 -07:00
Quang Luong
89a61d9374
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 815af2ba6e
2019-07-30 17:27:19 -07:00
Quang Luong
b66a8c86a4
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 5c4a0e3444
2019-07-30 17:26:35 -07:00
Quang Luong
5c4a0e3444
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
...
am: 17908b1e8f
2019-07-30 17:16:00 -07:00
