27750 Commits

Author SHA1 Message Date
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
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
e6ce88ca3c Merge "Add extra data when starting emergency dialer intent"
am: 0b925f85c0

Change-Id: I9dc0b8711534c1dcdc5715a888a87fb4730f5061
2018-09-16 22:27:03 -07:00
Shaotang Li
0b925f85c0 Merge "Add extra data when starting emergency dialer intent" 2018-09-17 04:14:51 +00:00
Evan Laird
3832515acf Merge "Leave spaces between Operator name and Clock in StatusBar"
am: 375af769e6

Change-Id: If2c314f7dc98ffe4d461c90263503e66f72ada48
2018-09-13 12:24:02 -07:00
Shigeki Yokomichi
52a11bbe15 Leave spaces between Operator name and Clock in StatusBar
In StatusBar, there are no spaces between Operator name and Clock,
so leaving spaces to improve design.

Bug: 114133664
Test: Manual, enable operator name in status row
config_showOperatorNameInStatusBar, insert sim card with operator name,
watch status row.

Change-Id: I1a2e33436ed50d429ae4b1769d0a72d501233a22
2018-09-13 11:39:30 +00:00
yuanjiahsu
88363e9b2f 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: 113539598
Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
2018-09-11 15:04:51 +08:00
Shaotang Li
f9a69e2d24 Add extra data when starting emergency dialer intent
This data is used for emergency dialer metrics to determine where user
enters emergency dialer.

Bug: 111378820
Test: manual
Change-Id: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
Merged-In: Id2b6ea71d32ccfb913c84b3c44cc4752acb6fd99
2018-09-06 05:28:32 +00:00
Alison Cichowlas
b7a11d3748 Add process-lifecycle-owner-initializer to tests.
Bug: 112587252
Bug: 114073652
Test: This is to fix the tests.
Change-Id: I083db4e2eb4efd8d4a914f33ac259aa317e568de
Merged-In: I083db4e2eb4efd8d4a914f33ac259aa317e568de
(cherry picked from commit 5f5ad2e6274f28772d70de0a97301fd17ab7f4d3)
(cherry picked from commit 0757deaad67bfa7d09e210566fdc7638fd8b8e3f)
2018-09-05 13:57:10 -07:00
Jason Monk
2c3a8045cd Convert sysui to bp
Test: tests gonna test, builds gonna build
Change-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
Merged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
(cherry picked from commit a2f2d82f2698ca4d9fcfad2a94b5b683646c085d)
(cherry picked from commit 1a8ee9d2f9bda161301469488d9a27baf5398233)
(cherry picked from commit 83ce30d807c3621f47f753e75f41d2b887e3ccba)
2018-09-05 13:57:10 -07:00
Jason Monk
4a8305dca6 Cleanup trying to move to bp
- Remove some resources that don't appear to do anything
 - Don't assume resource ids are final, because they aren't when
   compiled as a library

Test: build
Change-Id: I498bc2612d3f47df5f567c18c29e1666431e971c
Merged-In: I498bc2612d3f47df5f567c18c29e1666431e971c
(cherry picked from commit 05dd5671720985c03f35ec476591fb0d8399a018)
(cherry picked from commit a9b2fcad7a1ba9b5a459f46cc40504c7ea4fe590)
(cherry picked from commit 4c9d66e56cc8c324c2dc87f75e6338b7464d6eaf)
2018-09-05 13:57:09 -07:00
Alison Cichowlas
0757deaad6 Add process-lifecycle-owner-initializer to tests.
Bug: 112587252
Bug: 114073652
Test: This is to fix the tests.
Change-Id: I083db4e2eb4efd8d4a914f33ac259aa317e568de
Merged-In: I083db4e2eb4efd8d4a914f33ac259aa317e568de
(cherry picked from commit 5f5ad2e6274f28772d70de0a97301fd17ab7f4d3)
2018-09-05 19:57:24 +00:00
Jason Monk
83ce30d807 Convert sysui to bp
Test: tests gonna test, builds gonna build
Change-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
Merged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
(cherry picked from commit a2f2d82f2698ca4d9fcfad2a94b5b683646c085d)
(cherry picked from commit 1a8ee9d2f9bda161301469488d9a27baf5398233)
2018-09-05 12:50:09 -07:00
Jason Monk
4c9d66e56c Cleanup trying to move to bp
- Remove some resources that don't appear to do anything
 - Don't assume resource ids are final, because they aren't when
   compiled as a library

Test: build
Change-Id: I498bc2612d3f47df5f567c18c29e1666431e971c
Merged-In: I498bc2612d3f47df5f567c18c29e1666431e971c
(cherry picked from commit 05dd5671720985c03f35ec476591fb0d8399a018)
(cherry picked from commit a9b2fcad7a1ba9b5a459f46cc40504c7ea4fe590)
2018-09-05 19:48:27 +00:00
Aurimas Liutikas
b8616dc4d1 Migrated SystemUI & SettingsLib to androidx
Test: make SystemUI SettingsLib
Bug:76692459
Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95
Merged-In: I248fdf4042a0a97bc6349091da21c936c2d37c95
(cherry picked from commit fd52c1433c4e4d3f53aef2454d03f6b58f2411a3)
(cherry picked from commit d366771e84f584330c21b6381c902518af110034)
(cherry picked from commit a14377a450a7172963ab7ec1b3e47444a3249216)
2018-08-28 14:19:51 -07:00
Aurimas Liutikas
a14377a450 Migrated SystemUI & SettingsLib to androidx
Test: make SystemUI SettingsLib
Bug:76692459
Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95
Merged-In: I248fdf4042a0a97bc6349091da21c936c2d37c95
(cherry picked from commit fd52c1433c4e4d3f53aef2454d03f6b58f2411a3)
(cherry picked from commit d366771e84f584330c21b6381c902518af110034)
2018-08-28 11:51:13 -07:00
Wesley.CW Wang
e18215a780 Merge "Separated emergency option final UI"
am: c906be3b4f

Change-Id: I14c3d0146d02ecd770a00a099231eeb7b3d9d03a
2018-08-16 16:43:04 -07:00
CY Cheng
0f7856add6 resolve merge conflicts of e58c7805711b76fcb92fad0b7c4a57651176cf50 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
2018-08-16 10:43:49 +00:00
Treehugger Robot
c906be3b4f Merge "Separated emergency option final UI" 2018-08-16 03:10:59 +00:00
Treehugger Robot
e58c780571 Merge changes I7122ff52,I1140fa41,If359662a
* changes:
  Fix Power menu background vanish
  Add separated emergency option on power menu
  Add emergency dialer option on power menu
2018-08-16 03:10:54 +00:00
Xiangyu/Malcolm Chen
a009bfe6e1 Merge "Remove old SubscriptionInfo constructors."
am: 03fcb263ab

Change-Id: I2971fc5506ee6ca0d70b9b952e420e5233b8c28f
2018-08-14 13:58:12 -07:00
Xiangyu/Malcolm Chen
03fcb263ab Merge "Remove old SubscriptionInfo constructors." 2018-08-14 18:58:25 +00:00
Malcolm Chen
fdcf6469f1 Remove old SubscriptionInfo constructors.
Bug: 92796390
Test: build
Change-Id: Id5ce174b43934e690f6c1682e502b3b7e344a865
Merged-In: Id5ce174b43934e690f6c1682e502b3b7e344a865
2018-08-13 16:33:18 -07:00
Wesley.CW Wang
d560e8f50c 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: 110658988
Change-Id: I2a3c5ce053aab05381806eedf108cec54af808b1
Merged-In: Id13bcb5b5242ded92b309667c5e2beb8694b9977
2018-08-13 12:08:04 +08:00
Wesley.CW Wang
db357c7bd1 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: 111101759

Change-Id: I7122ff52fd14021ac01b1ab9d64e7dde71fa7ab1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
2018-08-13 12:06:17 +08:00
Wesley.CW Wang
00e2fcf978 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
Bug: 80376488
2018-08-13 12:02:13 +08:00
Wesley.CW Wang
74b9579088 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: 80376488
Change-Id: If359662a4d60dbe0ded89c3afe35db91dca4c445
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
2018-08-13 11:58:23 +08:00
Tetsutoki Shiozawa
ada90d75a5 Merge "Fix: [SystemUI] icon_blacklist is not reset for sub users" am: e8465e8480
am: 24c969b16d

Change-Id: I5af6639f4fcd476ea28b73ddb96930a83cd5d7df
2018-08-09 11:01:32 -07:00
Tetsutoki Shiozawa
24c969b16d Merge "Fix: [SystemUI] icon_blacklist is not reset for sub users"
am: e8465e8480

Change-Id: Ic9767915d326b674b0ef3ab21cbc9bf280115121
2018-08-09 10:43:48 -07:00
Tetsutoki Shiozawa
3689663ca7 Fix: [SystemUI] icon_blacklist is not reset for sub users
Symptom:
System icon tuner preference is removed at P-osv but icon_blacklist
setting remains for sub users. There is no way to reveal the hidden
icons.

Bug: 111575893
Change-Id: I5174657048c24e5f85bbf2bb936a97a51262eee5
2018-08-09 11:33:53 +09:00
Takamasa Kuramitsu
daf38b21b7 DO NOT MERGE: Fix mobile in/out activity indicator icons are not shown correctly
Mobile in/out indicator icons on status bar are not shown correctly.
- When only in indicator is requested, both in/out indicators are shown
- When only out indicator is requested, neither of in/out indicators are
shown

This CL fixes both of in/out indicators are shown properly.

Fixes: 112321399
Test: com.android.systemui.demo command
Change-Id: I803f21aecc444243c12ed75e2f148963742bce4a
2018-08-08 14:03:27 +00:00
Bill Yi
e146185f6f Import translations. DO NOT MERGE
Change-Id: I182bf58f1a2dc24a8c11928301a361734a3660c4
Auto-generated-cl: translation import
2018-08-04 03:35:34 -07:00
Tracy Zhou
b3fb26272c Merge "Make Recents onboarding less aggressive." into pi-dev
am: edb7637654

Change-Id: If00fd4b6f3f402d5ab5704962cbe219b311c0cdb
2018-07-20 17:25:06 -07:00
TreeHugger Robot
edb7637654 Merge "Make Recents onboarding less aggressive." into pi-dev 2018-07-20 21:39:06 +00:00
Bill Yi
1ebed6c6a8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I41d34c587e13dc69f9dfe253f88b08a6a6c127c7
2018-07-20 10:03:48 -07:00
Tracy Zhou
4a4c17bd75 Make Recents onboarding less aggressive.
Tip appears the 1st time - when user swipe up from home for 3 times & never gone into overview from app.
Tip appears the 2nd time - if user "X" or ignores the 1st tip, we show it again after user opens 5 apps.
Tip appears the 3rd time - if user "X" or ignores the 2nd tip, we show it again after user opens 40 apps. (before it was 10 apps)
Tip never appears again - if user "X" or ignore the 3rd tip.

Change-Id: I8077be8ef9ae3a45d8a6ae131cec8dc10a614bc1
Fixes: 111413686
Test: manual test
2018-07-18 14:09:15 -07:00
Evan Laird
08f22c1e2d Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev
am: ca53cf7f9a

Change-Id: I5b324408048abe4977cd84767c8f034e4ccc56a9
2018-07-18 13:14:23 -07:00
Treehugger Robot
2e08b42aff Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" 2018-07-18 14:59:20 +00:00
eddy-sh.chen
bfc28a4348 [DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing
Bug: 80362864
Bug: 111478851

Change-Id: Iec6e27285bf35238d378e6561896f1d0b303fa24
2018-07-18 01:49:02 +00:00
Evan Laird
cf845036e5 DO NOT MERGE: Use quick_qs_total_height when QS is not disabled
A change in the logic of QuickStatusBarHeader#updateResources
mistakenly used quick_qs_offset_height for the total height of the qqs
panel instead of quick_qs_total_height. This caused the quick-quick
settings panel to be too short on devices which don't have a large
notch.

Test: visual, on device without a notch
Change-Id: I0deed2560328501e547b04239133e350cdac4ff6
Fixes: 111554577
2018-07-17 20:41:18 +00:00
Hall Liu
fce4acd679 Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" 2018-07-16 22:52:10 +00:00
Hall Liu
79b6840516 Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""
This reverts commit 0082b161ca42b41925fd5973f1779fc4c46f6034.

Reason for revert: build breaks fixed

Change-Id: I75ea63ceaae6e970ce51a971c9a4635d0ce3f9e4
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-14 00:32:56 +00:00
Treehugger Robot
f92ad05fa5 Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" 2018-07-13 16:34:30 +00:00
Yueming Wang
0082b161ca Revert "Update SubscriptionInfo o use strings for mccmnc"
This reverts commit 0c149bd2d84d6e7c21dd4d7fff1e4dcfd51318f3.

Reason for revert:  reverting this topic as it breaks several branches.

Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-13 11:15:50 +00:00
Evan Laird
67a6e07ed3 Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev
am: 090e9d232c

Change-Id: Ifdd605c54262b533b405a6161b7b857609d576bc
2018-07-12 17:54:51 -07:00
Hall Liu
2656f6d049 Merge "Update SubscriptionInfo o use strings for mccmnc" am: 0babf1815c
am: 08a4eb9445

Change-Id: I0462d1de1c2622499470b00195897ce370a13020
2018-07-12 16:07:43 -07:00
Hall Liu
08a4eb9445 Merge "Update SubscriptionInfo o use strings for mccmnc"
am: 0babf1815c

Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
2018-07-12 15:22:52 -07:00