Commit Graph

26497 Commits

Author SHA1 Message Date
Andrew Sapperstein
e8bd1c48d0 Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev
am: 067332ca9e

Change-Id: I7659232cad1d477864b310cc83d41ae6a9bd4f0f
2019-04-30 00:12:23 -07:00
Raff Tsai
5458399357 Merge "Fix toggle button is enabled state but can't click" into qt-dev
am: f9fd3b9e17

Change-Id: I08bd28a91fa7d6e4d13d9844a72e3b26036f60a2
2019-04-30 00:11:37 -07:00
Fan Zhang
7ba7f47ae3 Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
am: 4fe327858f

Change-Id: Ieaaf0c62fb2e4d5d6aa25ccd2cc62ad2dea04a41
2019-04-30 00:10:49 -07:00
Lei Yu
f6ff7a02fb Merge "Hide number label if info is opportunistic" into qt-dev
am: 1a66d9b22f

Change-Id: I5163816c04b825a98067e63db18d4020dfbcdcd1
2019-04-30 00:10:07 -07:00
Andy Chou
5f82b6e72e Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
am: 8c16ef2906

Change-Id: I2b024b585edf065d94d9f25dc97d333bf3a289c3
2019-04-30 00:09:23 -07:00
Chandan Nath
2ab7fab9a8 Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
am: 2f2a3c4055

Change-Id: Ic6af3ffd48b508d93bbda564187547c90249337f
2019-04-30 00:08:26 -07:00
hughchen
a35353d687 Merge "Fix media output slice is empty even BT device is paired" into qt-dev
am: 668edcfb95

Change-Id: If6fa5506edd2e89a1a725414ed791284825ad8a5
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef Merge "Add timestamp to recent used apps" into qt-dev
am: 80be930357

Change-Id: I9efc997ecef8785f9da838a5cbadb36e81006614
2019-04-30 00:06:49 -07:00
Kevin Chyn
4fcd3c6056 Merge changes I74d677dc,I17f4db85 into qt-dev
am: 8888d346d1

Change-Id: I0d6523d1a67b4dd1c99d30ebcdd3637535944983
2019-04-30 00:05:57 -07:00
Lei Yu
c86d7fb326 Merge "Update color filter for battery saver mode" into qt-dev
am: 30991963e4

Change-Id: Ida0eced5ae330de91a0f647f3f2c7eda60f1d8db
2019-04-30 00:05:05 -07:00
Fan Zhang
85dde88aa5 Merge "Include always ask button in SIM picker dialog" into qt-dev
am: d414c64dc3

Change-Id: I121e662ca5dad110ac53caa55cb8b72501e2bf4a
2019-04-30 00:04:22 -07:00
Salvador Martinez
0677441d03 Merge "Fix broken dark ui test" into qt-dev
am: 1eb92917c9

Change-Id: I96fb30ab6a4fd1a0b82727c4e3969b2e59c5d721
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd Merge "Improve the latency of NotificationChannelSlice" into qt-dev
am: c7564be562

Change-Id: I86c35f4c8d4dde32592ddec09926e226dbcc0751
2019-04-30 00:01:51 -07:00
Salvador Martinez
dfc1da749f Merge "Update BatteryUtils to update system battery estimate cache" into qt-dev
am: b96e56b16e

Change-Id: Iee088214fe89cc79a33bff4b7de98a7648ace5cf
2019-04-29 13:25:23 -07:00
Andrew Sapperstein
067332ca9e Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev 2019-04-26 20:27:01 +00:00
TreeHugger Robot
f9fd3b9e17 Merge "Fix toggle button is enabled state but can't click" into qt-dev 2019-04-26 20:00:48 +00:00
Fan Zhang
4fe327858f Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev 2019-04-26 19:57:09 +00:00
Andrew Sapperstein
c65ccd23b4 Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity.
Remove the entry point for SimSettings and redirect any intents to the new UI.

Filed b/131324863 to track deleting the code.

Fixes: 128859223
Bug: 131324863
Test: adb shell am start -a com.android.settings.sim.SIM_SUB_INFO_SETTINGS
shows main connectivity screens

Change-Id: I4a4ed5c34d231eaab929a923c7fcbbfc1e0ed6f3
2019-04-26 12:01:42 -07:00
Fan Zhang
f61db6e9d7 Fix incorrect mapping to get subscriptioninfo
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.

Fixes: 129038597
Test: robotest
Change-Id: If4277c425e6145e0e3ba716551d0dce46cdb61ab
2019-04-26 10:07:07 -07:00
Lei Yu
1a66d9b22f Merge "Hide number label if info is opportunistic" into qt-dev 2019-04-26 16:54:02 +00:00
Andy Chou
8c16ef2906 Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev 2019-04-26 15:04:25 +00:00
Chandan Nath
2f2a3c4055 Merge "Always show backup settings (even if backup is deactivated)." into qt-dev 2019-04-26 08:14:53 +00:00
andychou
7c89a929c4 Avoid IMEI overrided by getSummary() for dual SIM condition
IMEI information will be overrided by getSummary() and cause second slot IMEI is
oerrided by first slot.
Avoid IMEI is override by first slot information.

Bug: 131124169
Test: Test with dual SIM device and atest
ImeiInfoPreferenceControllerTest, ImeiInfoDialogControllerTest pass

Change-Id: Ia0a028aa0103867f42fff610129cf7ce2d3910b7
2019-04-26 09:31:43 +08:00
TreeHugger Robot
668edcfb95 Merge "Fix media output slice is empty even BT device is paired" into qt-dev 2019-04-26 00:46:48 +00:00
TreeHugger Robot
80be930357 Merge "Add timestamp to recent used apps" into qt-dev 2019-04-25 22:54:20 +00:00
Kevin Chyn
8888d346d1 Merge changes I74d677dc,I17f4db85 into qt-dev
* changes:
  Only gray out remove button after positive button is pressed
  Check PackageManager before getting system service
2019-04-25 22:48:02 +00:00
Lei Yu
7e9ef34112 Hide number label if info is opportunistic
Fixes: 125855323
Test: RunSettingsRoboTests
Change-Id: I6f77d65691319097c9bf56232710ba12fa7360f3
2019-04-25 14:56:59 -07:00
Lei Yu
30991963e4 Merge "Update color filter for battery saver mode" into qt-dev 2019-04-25 21:42:56 +00:00
TreeHugger Robot
d414c64dc3 Merge "Include always ask button in SIM picker dialog" into qt-dev 2019-04-25 21:02:13 +00:00
Lifu Tang
c359536d0b Add timestamp to recent used apps
Bug: 129354132
Test: build, flash, and test manually
Change-Id: If8e657460da45db019633e95e77dffb1493997c0
2019-04-25 12:47:42 -07:00
TreeHugger Robot
1eb92917c9 Merge "Fix broken dark ui test" into qt-dev 2019-04-25 19:25:30 +00:00
Kevin Chyn
f19fb6fa46 Only gray out remove button after positive button is pressed
Fixes: 131252811

Test: manual
Change-Id: I74d677dc5608b21045b148020a13d5ea5c1bde20
2019-04-25 12:21:29 -07:00
Kevin Chyn
acc340d615 Check PackageManager before getting system service
Fixes: 131285189

Test: manual
Change-Id: I17f4db85afc5969c58a0a08667ef05786302712b
2019-04-25 12:17:26 -07:00
TreeHugger Robot
c7564be562 Merge "Improve the latency of NotificationChannelSlice" into qt-dev 2019-04-25 17:31:16 +00:00
Salvador Martinez
b0737ee174 Fix broken dark ui test
It was checking something in shared preferences which seems
to have stopped working (a bunch of the stuff used in the
test is deprecated). This CL just has it verify that
updateDarkTheme() is called when appropriate since that
is all we really care about.

Test: is a test
Bug: 130897882
Change-Id: If3286dd91b5a95cb0f41cac619a11a9089e0aecf
2019-04-25 10:25:15 -07:00
Salvador Martinez
b96e56b16e Merge "Update BatteryUtils to update system battery estimate cache" into qt-dev 2019-04-25 17:23:28 +00:00
Pasty Chang
6c43c5a924 Merge "Update the fingerprint skip dialog" into qt-dev
am: d6f9ec122d

Change-Id: I0484722780e03a3e84a00bdc8a988cfb4e61467f
2019-04-25 02:17:09 -07:00
Pasty Chang
bd758f8126 Merge "Change to show generic lock screen before setup fingerprint or face" into qt-dev
am: 393492438b

Change-Id: I1fa9ef561d0b90588b5d6817360cadf004cb6010
2019-04-25 02:16:00 -07:00
joshmccloskey
c397945810 Merge "Fixed Infinite loop method call." into qt-dev
am: 6cee809841

Change-Id: I0d5bd71d683bc62c12cde41e61c9c5295569bfec
2019-04-25 00:18:04 -07:00
Clown SHEN
2cd35901f6 Merge "Fix NPE when connect timeout" into qt-dev
am: 05e680d3c8

Change-Id: I07678d8119d7f8f3d9d53998115612113bbbcfb8
2019-04-25 00:17:19 -07:00
Andrew Sapperstein
69fde85537 Merge "Update "ask every time" asset." into qt-dev
am: 30859ac832

Change-Id: I5479181f38b75ad5b23ca8c9605baf36f681826b
2019-04-25 00:15:45 -07:00
Fan Zhang
3a5dd82969 Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev
am: c78e4d1e0f

Change-Id: I10e0331a85f7bb1626639896ecca7a445855dcac
2019-04-25 00:14:59 -07:00
Lei Yu
70f7a64133 Merge "Fix issue in panel logging" into qt-dev
am: 2b60204dba

Change-Id: I6561852b672e29f5aaddd2ef242e59698e1e2b6c
2019-04-25 00:14:09 -07:00
Fan Zhang
7be1bcf26c Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
am: 9fa82a370b

Change-Id: If9af81bfa4d99eee0b211b7216b3ca9d1baa66f2
2019-04-25 00:13:10 -07:00
Antony Sargent
d6209877b1 Merge "Implement off state for SIM details page" into qt-dev
am: 62d580d5b4

Change-Id: I37c513eb170667c6729b6a94a7788f24229dcf5a
2019-04-25 00:12:19 -07:00
Julia Reynolds
953bb4514c Merge "Fix notification preferences" into qt-dev
am: 42eefd0d7e

Change-Id: I177e26feac7fd555e9e86c4bc730764a993e36bb
2019-04-25 00:08:26 -07:00
Ilya Matyukhin
67459a21ff Merge "Use auth token from intent extras" into qt-dev
am: 172d03c758

Change-Id: Ia410ae2ee581bd318f5d245e829b7d4a53af9b12
2019-04-24 23:44:06 -07:00
Pasty Chang
d6f9ec122d Merge "Update the fingerprint skip dialog" into qt-dev 2019-04-25 06:12:19 +00:00
Pasty Chang
393492438b Merge "Change to show generic lock screen before setup fingerprint or face" into qt-dev 2019-04-25 06:12:19 +00:00
Raff Tsai
af4180cf24 Fix toggle button is enabled state but can't click
Fixes: 131197520
Test: manual
Change-Id: Id9f83b4abea55d2569049a48622d473d7f51042f
2019-04-25 12:08:21 +08:00