Commit Graph

19239 Commits

Author SHA1 Message Date
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
55b91f6d93 Merge "Add feature flag in Settings." 2018-09-17 13:43:08 +00:00
Shaotang Li
0b925f85c0 Merge "Add extra data when starting emergency dialer intent" 2018-09-17 04:14:51 +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
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 05dd567172)
(cherry picked from commit a9b2fcad7a)
(cherry picked from commit 4c9d66e56c)
2018-09-05 13:57:09 -07: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 fd52c1433c)
(cherry picked from commit d366771e84)
(cherry picked from commit a14377a450)
2018-08-28 14:19:51 -07: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
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
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
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
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 0082b161ca.

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 0c149bd2d8.

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
Hall Liu
08a4eb9445 Merge "Update SubscriptionInfo o use strings for mccmnc"
am: 0babf1815c

Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
2018-07-12 15:22:52 -07:00
Hall Liu
0babf1815c Merge "Update SubscriptionInfo o use strings for mccmnc" 2018-07-12 21:13:16 +00:00
Hall Liu
0c149bd2d8 Update SubscriptionInfo o use strings for mccmnc
Add methods to get mcc/mnc as strings so that the leading-zero
ambiguity is resolved.

Test: manual (db update), unit tests
Bug: 35064313
Change-Id: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-10 15:51:26 -07:00
Neil Fuller
36beeefc84 Merge "Remove unusual static method call"
am: cbe9c295a3

Change-Id: I3ae602232226ef3a1e482dd5a34e1025118c30b7
2018-07-05 05:24:39 -07:00
Treehugger Robot
cbe9c295a3 Merge "Remove unusual static method call" 2018-07-05 11:12:35 +00:00
Neil Fuller
9c610f7567 Remove unusual static method call
The code is using static method Calendar.getInstance() but via a
subclass of Calendar. It works, and getInstance() returns a
GregorianCalendar on Android, but it's odd and was probably unintended.

Noticed during static analysis of SystemUI bytecode.

Bug: 111055375
Test: build / boot
Change-Id: I1762cbeb2cc7882868f84ec11100815671cd29ec
2018-07-05 10:23:53 +01:00
Shuichi.Noguchi
08923b73f4 Merge "Fix the logic to get tv_pip_settings_class_name"
am: d004710e0e

Change-Id: Ieecde6f75fd7788835fa34300f1fbec5eb963862
2018-07-04 17:07:32 -07:00
Treehugger Robot
d004710e0e Merge "Fix the logic to get tv_pip_settings_class_name" 2018-07-04 22:45:16 +00:00
Lucas Dupin
1d580b825a Merge "Animate owner info during wake-up transition" into pi-dev
am: c28e772042

Change-Id: I24a01e8e9ea9d82275a7434fc8dfdc5d1f4a30ad
2018-06-07 21:10:12 -07:00
TreeHugger Robot
c28e772042 Merge "Animate owner info during wake-up transition" into pi-dev 2018-06-08 03:38:01 +00:00
Lin Guo
ab6758a0a4 Merge changes from topic "volume-change-flags" into pi-dev
am: a88cf78009

Change-Id: Idbcaa08b7255c8d2dfd7d2bae42fe1daf3c12bf8
2018-06-07 19:12:25 -07:00
TreeHugger Robot
a88cf78009 Merge changes from topic "volume-change-flags" into pi-dev
* changes:
  Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
  Comply with the volume callback change
2018-06-08 01:58:10 +00:00
Anarghya Mitra
9a91f277a7 Change Quick Settings to account for branded VPNs.
am: 10422896ed

Change-Id: If9b181b5d4175f9418b4c8b0e4a8938b0bc98811
2018-06-07 18:05:07 -07:00
Lin Guo
f37d0ebe8c Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Bug: 109841417
Test: manual

Change-Id: Icc803a4b22ceccff7d3e788b9164975a8e395a3b
2018-06-07 17:09:43 -07:00
Anarghya Mitra
10422896ed Change Quick Settings to account for branded VPNs.
Screenshots: https://photos.app.goo.gl/FrnK69TXR86npFmY2
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs
Bug: 109837832
Change-Id: Ie447e6598ff593ff5d14ec8787db82ba39c9ea54
2018-06-07 23:53:27 +00:00
Aarthi Balachander
04eb291350 Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev
am: 36fc3b1a53

Change-Id: I9d4fd38bdfa3c605583436cda9f331148113d551
2018-06-07 15:59:53 -07:00
Hongwei Wang
c8cdc59322 Comply with the volume callback change
Bug: 109841417
Test: m -j
Change-Id: I43a139b97f89a666088db39579b068dc76babd56
2018-06-07 15:35:25 -07:00
TreeHugger Robot
36fc3b1a53 Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev 2018-06-07 21:42:59 +00:00
Lucas Dupin
8c24406355 Merge "Hide backdrop when waking up from fp" into pi-dev
am: e752b75dad

Change-Id: Idebf2c288fa3de5a05329c9d0f53f9183c834d0e
2018-06-07 14:10:31 -07:00
TreeHugger Robot
e752b75dad Merge "Hide backdrop when waking up from fp" into pi-dev 2018-06-07 20:40:33 +00:00
Lucas Dupin
7c66fae398 Merge "Update scrims when keyguard gets occluded" into pi-dev
am: cc4efe08de

Change-Id: Iaa8fa466561a962d2a0264e40309492e1d5d55d8
2018-06-07 10:14:36 -07:00
TreeHugger Robot
cc4efe08de Merge "Update scrims when keyguard gets occluded" into pi-dev 2018-06-07 16:50:34 +00:00
Winson Chung
713695f8cd Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
am: fc16950683

Change-Id: I2745a8ab3e22a49975bc0311ef8bf7bfc5e109e9
2018-06-06 19:50:23 -07:00
Lucas Dupin
09952ee560 Animate owner info during wake-up transition
Change-Id: Idaaeeecbdcd361b1bba29321f805496f660dd319
Fixes: 80460589
Test: visual
2018-06-06 19:43:35 -07:00
Winson Chung
fc16950683 Merge "Skip finishing menu activity when dismissing PiP" into pi-dev 2018-06-07 00:35:54 +00:00
Evan Laird
9d55905221 Merge "Status bar etc dots 4dp" into pi-dev
am: d54c3a3036

Change-Id: I49514e9213e36ff5d3138c0b352af4be9b370282
2018-06-06 15:44:20 -07:00