Commit Graph

27846 Commits

Author SHA1 Message Date
Bill Lin
e4df226c6d Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev
am: 2f97046a4e

Change-Id: I3f3f5d49b390dd7841ade7e33fd2ddc5e5309aa1
2018-10-24 02:49:00 -07:00
Bill Lin
2f97046a4e Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev 2018-10-24 09:35:33 +00:00
Niklas Lindgren
a65185a0f6 Merge "Remove resources for 4G/LTE/LTE+ icons" am: 1868b7eec8
am: 75ff8539c0

Change-Id: I457f6597cac8feed6210850b47293db31c1ebcac
2018-10-19 13:31:50 -07:00
Niklas Lindgren
75ff8539c0 Merge "Remove resources for 4G/LTE/LTE+ icons"
am: 1868b7eec8

Change-Id: I5a2a49fffa76cf6a8c329f719d108d77ef1f538d
2018-10-19 13:09:14 -07:00
Niklas Lindgren
2132595d59 Remove resources for 4G/LTE/LTE+ icons
CarrierConfig values have been added to better support MVNOs.
Remove the legacy resources.

Test: Make sure that marlin builds with the new carrier configs.
Bug: 113309357
Bug: 113309356
Change-Id: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316
Merged-In: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316
2018-10-19 18:23:44 +00:00
Hall Liu
13d2b5f1ab Merge "Add dynamic support for 4G/LTE/LTE+ icons" am: 0c9254ee66
am: 5bd6b4d570

Change-Id: Ib0c30a20063087de7e336d01675f83de0aa64c7d
2018-10-18 15:30:11 -07:00
Hall Liu
5bd6b4d570 Merge "Add dynamic support for 4G/LTE/LTE+ icons"
am: 0c9254ee66

Change-Id: Ie5841b4e86231517f724948389ff2b819d8245ad
2018-10-18 14:56:21 -07:00
Hall Liu
0c9254ee66 Merge "Add dynamic support for 4G/LTE/LTE+ icons" 2018-10-18 20:36:06 +00:00
Gus Prevas
30afdb38b0 Merge "Checks keyguard earlier when blocking notifications." into pi-dev
am: e7ca4fe6ee

Change-Id: I5f36bac36447c4a7edb6b9df5be86d4caaa5b41b
2018-10-18 07:14:23 -07:00
TreeHugger Robot
e7ca4fe6ee Merge "Checks keyguard earlier when blocking notifications." into pi-dev 2018-10-17 21:43:49 +00:00
Bill Lin
6c7ccabd1d Device show "No SIM card" and then showing carrier name during boot
Keyguard default show NO SIM earlier than Telephony/Subscription callback
Refactor CarrierText & KeyguardUpdateMonitor
 - Replace setup flag by resource attr(showMissingSim/showAirplaneMode)
 - Remove setDiplayFlags API, and add mTelephonyCapable flag
 - Implement MSG_TELEPHONY_CAPABLE in KeyguardUpdateMonitor
 - Default do not show AirplaneMode & NO_SIM label unless define in xml

Bug: 111732320
Test: atest SystemUITests
      atest frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
      Manual:
         1) Insert SIM and reboot device, only show "No Service"->"Operator"
	 2) Remove SIM and reboot device, only show "No SIM"
	 3) Enable AirplaneMode reboot, only show "Airplane mode"
	 4) Insert SIM and trigger sysui crash, state same as 1)
	 5) Remove SIM and trigger sysui crash, state same as 2)
	 6) Enable APM trigger sysui crash, state same as 3)
	 7) Enable APM & WFC, turn on wifi in keyguard showing
	    -> "Airplane mode" -> "" -> "WiFi Calling"
	 8) Enable APM & WFC, turn off wifi in keyguard showing
	    -> "Wifi Calling" -> "Airplane mode"

Change-Id: I4459997420484431751a4c088aa3856724affe6a
Merged-In: I4459997420484431751a4c088aa3856724affe6a
2018-10-17 19:29:12 +00:00
Fabian Kozynski
bae081d202 DO NOT MERGE resolve merge conflicts of c6a1cfda93 to pi-dev-plus-aosp
Change-Id: I1a18690e85f66ff2a25329f9a050cb038fc0bcfb
Bug: None
Test: I solemnly swear I tested this conflict resolution.
2018-10-17 10:30:00 -04:00
Gus Prevas
f4f0b069a3 Checks keyguard earlier when blocking notifications.
This change modifies NotificationInfo to call the provided keyguard
callback when the "Stop notifications" button is tapped, rather than
when trying to save the new importance value after the undo timeout.

Test: updated test cases in NotificationInfoTest.
Bug: 111416533
Change-Id: I89b4715d0d41be4587753f554862e51c4e1d43c3
Merged-In: I89b4715d0d41be4587753f554862e51c4e1d43c3
(cherry picked from commit 533836ac72)
2018-10-17 14:22:03 +00:00
Fabian Kozynski
c6a1cfda93 Merge "DO NOT MERGE Fixes clipping on PagedTileLayout" into pi-dev 2018-10-17 13:21:15 +00:00
Bill Yi
574c417c4d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I213983e8a9a9f554aa6fc0002c55e31248278614
2018-10-16 01:42:01 -07:00
Selim Cinek
12340d1d32 Merge "Fix overlap between operator name and heads-up notification" am: a3608c9116
am: 5013f1c08c

Change-Id: I786b5445e080a3fa9ae9ed90d023c5a6c5a812d5
2018-10-15 16:18:20 -07:00
Selim Cinek
5013f1c08c Merge "Fix overlap between operator name and heads-up notification"
am: a3608c9116

Change-Id: If09c46bba04bca2e2cda99173bc53a2d7e8488e7
2018-10-15 15:56:13 -07:00
Selim Cinek
a3608c9116 Merge "Fix overlap between operator name and heads-up notification" 2018-10-15 22:15:19 +00:00
Tetsutoki Shiozawa
f1e0f7adad Fix overlap between operator name and heads-up notification
The title of heads-up notification was shown incompletely
becaue it's covered by operator name.
To fix this issue, the operator name should be hidden
when a heads-up notification is shown.

Fixes: b/116533819
Test: atest SystemUITests
Test: manual - enable config_showOperatorNameInStatusBar
               and show a heads-up notification

Merged-In: Id3318cd7cb2c9b6950392fadd11d02ab873d84c5
Change-Id: Id3318cd7cb2c9b6950392fadd11d02ab873d84c5
2018-10-15 20:52:21 +00:00
Beverly Tai
3ed8b48077 Merge "Prevent NFE in SystemUI when parsing invalid int" am: 9d7e1fe726
am: c59c6ca9a1

Change-Id: I178f593072e901343b57f2c03f2bd8da20811c9e
2018-10-15 08:08:22 -07:00
Beverly Tai
c59c6ca9a1 Merge "Prevent NFE in SystemUI when parsing invalid int"
am: 9d7e1fe726

Change-Id: Ic015f0f87d7d8044701d9326afdd71893879f3b0
2018-10-15 07:59:13 -07:00
Beverly Tai
9d7e1fe726 Merge "Prevent NFE in SystemUI when parsing invalid int" 2018-10-15 13:27:41 +00:00
Bill Yi
35aebf1bc4 Import translations. DO NOT MERGE
Change-Id: Iddad0d8a7bdf790a85d4ff8204e3b6465ea97514
Auto-generated-cl: translation import
2018-10-14 22:28:32 -07:00
Fabian Kozynski
4ba5173818 DO NOT MERGE Fixes clipping on PagedTileLayout
Manually cherry-picked from ag/5161962 and ag/5213435

Defines left and right bounds for clipping the pages of PagedTileLayout
with the same width as the padding in PagedTileLayout.TilePage.

Test: manual && atest
Change-Id: I5023d5a20749ad239036c316e035e31bed013cff
Fixes: 117096186
2018-10-11 16:30:00 -04:00
Rick Yiu
096371b719 Merge changes If834d0f0,I05ec75c7 into pi-dev
am: 6d61113df4

Change-Id: Ie4c3729fc1258f0f452fb57b6b345e873bfb440d
2018-10-10 21:17:37 -07:00
TreeHugger Robot
6d61113df4 Merge changes If834d0f0,I05ec75c7 into pi-dev
* changes:
  Add null check for vrManager
  Add null check for vrManager
2018-10-11 03:17:18 +00:00
Niklas Lindgren
a02964d26f Add dynamic support for 4G/LTE/LTE+ icons
Move configuration of show4gForLte and hideLtePlus from resource
to CarrierConfig, to better support MVNOs.

These icons will be updated upon receiving CarrierConfigChange or
in case the default data SIM changes.

Test: Add different carrier config values for a carrier and change carrier.
Tested on both single and dual sim devices.
Bug: 113309357
Bug: 113309356
Change-Id: Ibd34e8948cc5d519626b935545d2c2fb1f771220
2018-10-08 11:56:13 +02:00
Leo Hsu
82e5908df0 RESTRICT AUTOMERGE: Removes feature flag for faster emergency call.
Removes feature flag and enables faster emergency call features by
default.

Test: Manually

Bug: 112168722
Bug: 117128459
Change-Id: I81e64a229598b8c11a721a0dee7033f6ae3e4fdd
2018-10-04 01:02:12 +00:00
Beverly
503ae21287 DO NOT MERGE Synchronize ZenModeControllerImpl callbacks
Test: manual
Bug: 115688927
Change-Id: Ib47913c7b5522c40405fadd97d570d5f197f71dc
2018-10-03 12:36:04 -04:00
Shaotang Li
8af3a2416e Add new metrics in power menu
These include,
1. An event indicating that power menu is shown.
2. An event indicating that user taps the emergency dialer icon.

Bug: 112168722
Bug: 111378820

Test: manual and check the result of
'adb logcat -b events | grep sysui_multi_action'

Change-Id: I958ed1af65f559e4999517031cd80fbb1c417108
Merged-In: I958ed1af65f559e4999517031cd80fbb1c417108
2018-10-03 03:42:24 +00:00
yuanjiahsu
a80fbaa9f0 Add feature flag in Settings.
User can enable/disable faster emergency phone call feature by switching
this flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.

Test: Manually

Bug: 112168722
Bug: 113539598

Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
Merged-In: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
2018-10-03 11:14:09 +08:00
Shaotang Li
37768436a2 Add extra data when starting emergency dialer intent
This data is used for emergency dialer metrics to determine where user
enters emergency dialer.

Bug: 112168722
Bug: 111378820

Test: manual
Change-Id: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
Merged-In: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
2018-10-03 02:59:56 +00:00
Wesley.CW Wang
71db1f7601 Separated emergency option final UI
- Refine faster emergency icon.
 - Add ic_faster_emergency.xml to framework/core/res/drawable.
 - Remove faster_emergency_icon.xml from SystemUI/res/drawable.
 - Change emergency_icon.xml color to colorError.
 - Emergency option(India case) will follow separated option design if
 separated option feature is enabled.

Test: Manually,
use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show separated emergency option(default case),
use "adb shell settings put global emergency_affordance_needed 1" to show India emergency option(India case),
India emergency option will be separated button if feature is enabled,
otherwise it will be default design.
Change wallpaper to enable light/dark theme & check separated emergency option color.
(light theme color : D93025    dark theme color : E25142)

Bug: 112168722
Bug: 110658988

Change-Id: I2a3c5ce053aab05381806eedf108cec54af808b1
Merged-In: Id13bcb5b5242ded92b309667c5e2beb8694b9977
Merged-In: I2a3c5ce053aab05381806eedf108cec54af808b1
2018-10-03 02:58:38 +00:00
Wesley.CW Wang
3b0aa461b3 Fix Power menu background vanish
- Separated button & origin button use same HardwareBgDrawable caused
power menu background vanish when keyboard showing.
 - Let separated button use mSeparatedViewBackground & origin button use
 mListBackground to fix this bug.
 - Rename View mChild to mList.

Test: Manually, long press power key to launch power menu when keyboard
showing, power menu background should display normally.

Bug: 112168722
Bug: 111101759

Change-Id: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
Merged-In: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
2018-10-03 02:58:27 +00:00
Wesley.CW Wang
b44f2e5207 Add separated emergency option on power menu
- Add a separated button on power menu to launch emergency dialer.
 - Change HardwareUiLayout.java FrameLayout to LinearLayout, let it can
display separated button.
 - Add a flag to recognize separated button should show/hide, if
EmergencyAffordance(India) enabled, separated button will hide,
otherwise power menu will display separated button & power
menu last item won't get white background.

Test: Manually, use "adb shell settings put global faster_emergency_phone_call_enabled 1" to show/hide separated emergency option, press emergency option will go to emergency dialer.
Change-Id: I1140fa412b655c16f3052cbabd118df278fd7f23
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: I1140fa412b655c16f3052cbabd118df278fd7f23

Bug: 112168722
Bug: 80376488
2018-10-03 02:58:13 +00:00
Wesley.CW Wang
36d9d5bc55 Add emergency dialer option on power menu
Add a button on power menu to launch emergency dialer.
Add FASTER_EMERGENCY_PHONE_CALL_ENABLED to SettingsBackupTest blacklist.

Test: Manually

Bug: 112168722
Bug: 80376488

Change-Id: If359662a4d60dbe0ded89c3afe35db91dca4c445
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: If359662a4d60dbe0ded89c3afe35db91dca4c445
2018-10-03 02:57:38 +00:00
Neil Fuller
26465e8ad3 Merge "Remove unused / invalid import" am: 9073dc4839
am: a447164ae5

Change-Id: Iba5d22f9180d9ae8fa80034193934f6aa2b1b1c6
2018-10-02 16:48:04 -07:00
Neil Fuller
a447164ae5 Merge "Remove unused / invalid import"
am: 9073dc4839

Change-Id: Icd39d49c9fae7c11837434fdcbe5603310034ad3
2018-10-02 15:28:39 -07:00
Edward Savage-Jones
9a17312da5 Prevent NFE in SystemUI when parsing invalid int
A user can change the sysui_rounded_content_padding setting via adb.

If the value set is not an integer, SystemUI will end up in an exception
loop.

Bug: 117152006
Test: No crash when running:
      adb exec-out settings put secure sysui_rounded_content_padding a
Change-Id: I49cace6087effae20170eab9175fc84ebcd21781
2018-10-02 16:41:01 +00:00
Neil Fuller
4ff327141d Remove unused / invalid import
NavigationBarCompat imports sun.misc.Resource though
it doesn't need it.

Bug: 113148576
Test: build only
Change-Id: I26d6e0b3d9a8948333fdf9f3659b87b3b46a75d5
2018-10-01 11:32:36 +01:00
Jordan Liu
023c48e92b Merge "Dismiss SIM lock page after correct SIM" am: eb1d6d91af
am: 737945fbd5

Change-Id: I38e3374723e4e756688eb3572cffc59834924625
2018-09-26 17:22:24 -07:00
Jordan Liu
737945fbd5 Merge "Dismiss SIM lock page after correct SIM"
am: eb1d6d91af

Change-Id: I01551d9d8e14e7a9bd4ef5178b571beee032735b
2018-09-26 17:09:44 -07:00
Jordan Liu
eb1d6d91af Merge "Dismiss SIM lock page after correct SIM" 2018-09-26 23:42:55 +00:00
Jordan Liu
b4299d92e6 Dismiss SIM lock page after correct SIM
Previously the criteria was to dismiss if:
1. There is no pin/password/pattern set AND
2. the lockscreen is disabled.

This behaved incorrectly in the case where the lockscreen is enabled
but there is no pin/password/pattern set.

We fix the condition so that now we dismiss the SIM lock if:
1. There is no pin/password/pattern set OR
2. the lockscreen is disabled.

Fixes: 115780994
Test: manual
Change-Id: I88da896add635126934eb0ed22e617ac2607f15a
2018-09-26 12:59:57 -07:00
Rick Yiu
ee1df63a72 Add null check for vrManager
If VrManagerService is not started, vrManager will be null. Need
add check for it.

Test: system does not break if VrManagerService is not started
Bug: 116427118
Change-Id: I05ec75c73d11365e0b7bbaa603d0e96309d6fd1d
Merged-In: I05ec75c73d11365e0b7bbaa603d0e96309d6fd1d
2018-09-24 12:53:17 +08:00
Yuanjia Hsu
2cb9a70cac Merge "Add feature flag in Settings." am: 55b91f6d93
am: b04fcd5842

Change-Id: I22e073bcbe7c2bacfdce44dd4c05b47fab3059f1
2018-09-17 07:25:33 -07:00
Yuanjia Hsu
b04fcd5842 Merge "Add feature flag in Settings."
am: 55b91f6d93

Change-Id: I27aa24563358fe4467de3aa3660825f1d8bd73d5
2018-09-17 07:09:28 -07:00
Yuanjia Hsu
55b91f6d93 Merge "Add feature flag in Settings." 2018-09-17 13:43:08 +00:00
Shaotang Li
2f5d2a50a8 Merge "Add extra data when starting emergency dialer intent" am: 0b925f85c0
am: e6ce88ca3c

Change-Id: Id27700b585ddafbf20ebdbd14cd92b3f3cf75cd3
2018-09-16 22:35:42 -07:00
Shaotang Li
e6ce88ca3c Merge "Add extra data when starting emergency dialer intent"
am: 0b925f85c0

Change-Id: I9dc0b8711534c1dcdc5715a888a87fb4730f5061
2018-09-16 22:27:03 -07:00