Commit Graph

51805 Commits

Author SHA1 Message Date
Clown SHEN
dba84b1781 Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev
am: fbcf3708a6

Change-Id: I9d3f7e0d3c5afe2c339401aceebaef82e6761d0e
2019-04-30 07:20:47 -07:00
Bill Yi
91eefed117 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 47b32d0939 -s ours
am skip reason: subject contains skip directive

Change-Id: Icf4f2eb62d1e07c2a766bce1cda027db96bbf7c2
2019-04-30 00:15:16 -07:00
Andrew Sapperstein
d45dbafd4c Merge "Add a gap in the ordering for phone numbers." into qt-dev
am: d464f67e31

Change-Id: I7c96c514fb4f665adc9095036f9fd6bb437fdbc2
2019-04-30 00:15:00 -07:00
Antony Sargent
ec2dcef796 Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev
am: 06da2980a0

Change-Id: I924eb0f0fdf4f95294b45f171f752784f8db4604
2019-04-30 00:14:16 -07:00
Andrew Sapperstein
706db87435 Merge "Remove "data usage" from search." into qt-dev
am: 655e2e55e9

Change-Id: I4dd878cc6377d15c2cfbebef9555c9b6c384e1c8
2019-04-30 00:13:08 -07:00
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
958dea2303 Merge "Add keywords for battery saver schedule" into qt-dev
am: 3825e09706

Change-Id: If0efe8c77fa296dca1a9f5ab2638b9bf1be87617
2019-04-30 00:03:30 -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
Clown SHEN
fbcf3708a6 Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev 2019-04-27 06:42:45 +00:00
TreeHugger Robot
47b32d0939 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-27 06:01:25 +00:00
Bill Yi
3f0e2a1eed Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I84b1d9a020529c12781b308c4bc7a489cd924de1
2019-04-26 21:51:43 -07:00
TreeHugger Robot
d464f67e31 Merge "Add a gap in the ordering for phone numbers." into qt-dev 2019-04-26 23:00:39 +00:00
TreeHugger Robot
06da2980a0 Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev 2019-04-26 22:34:27 +00:00
Andrew Sapperstein
10cfaa0b7e Add a gap in the ordering for phone numbers.
Previously there was no gap which caused the second phone number to show below
Emergency info.

Fixes: 131378898
Test: visual inspection
Change-Id: If98d3442562d44f65a6e5ce896b71ee093d8616c
2019-04-26 14:00:53 -07:00
Antony Sargent
972bf437f6 Remove empty MNC filtering when retrieving available subscriptions
During the early phase of work on DSDS, we found that a hacky solution
to seeing duplicate subscriptions that are part of a logical group (eg
Google Fi) was to filter out the entries with empty MNC strings. It
turns out this breaks things for some legitimate eSIM subsctiptions, and
isn't needed anymore because of the fixes that landed for b/127833821.

Fixes: 130706446
Test: make RunSettingsRoboTests
Change-Id: Ic4472c1de3c3e2449139b3e2ffb20d11a0058e8a
2019-04-26 13:45:53 -07:00
Andrew Sapperstein
655e2e55e9 Merge "Remove "data usage" from search." into qt-dev 2019-04-26 20:28:06 +00: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
Andrew Sapperstein
62a68d6edb Remove "data usage" from search.
Fixes: 131324402
Test: verified manually
Change-Id: Ib72902c3eaa1f2427e9c1c835ba2939f28cf7a0d
2019-04-26 10:23:02 -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
TreeHugger Robot
3825e09706 Merge "Add keywords for battery saver schedule" into qt-dev 2019-04-25 21:00:28 +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
Salvador Martinez
5829b56657 Add keywords for battery saver schedule
We forgot to add keywords to battery saver schedule so that it
would show up in search. This simply adds the string and the
appropriate keywords for it.

Test: manual (keywords result in search results)
Bug: 129984960
Change-Id: I94983fed6a6236f4d8cee3fb19c841822fd507e2
2019-04-25 11:13:46 -07:00