OSDN Git Service
Joshua Mccloskey [Fri, 7 Jun 2019 19:32:31 +0000 (12:32 -0700)]
Merge "Updating colors for dark theme" into qt-r1-dev am:
6d24819758
am:
df8ef0d9bb
Change-Id: Id084a2f9d2b75eea18df67ede8a55545fdc9480f
Joshua Mccloskey [Fri, 7 Jun 2019 19:28:31 +0000 (12:28 -0700)]
Merge "Updating colors for dark theme" into qt-r1-dev
am:
6d24819758
Change-Id: Icde71ef65279e29bf64c0005e29e9db004550054
Joshua Mccloskey [Fri, 7 Jun 2019 19:15:11 +0000 (19:15 +0000)]
Merge "Updating colors for dark theme" into qt-r1-dev
George Chang [Fri, 7 Jun 2019 06:39:38 +0000 (23:39 -0700)]
[automerger skipped] Merge "Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc29b325a1" into qt-r1-dev-plus-aosp
am:
771b5468b9 -s ours
am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA1
6ddff97414 is in history
Change-Id: I8b4127787401f6d5d9384021f7e78da2c173a6ee
George Chang [Fri, 7 Jun 2019 06:39:10 +0000 (23:39 -0700)]
[automerger skipped] Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc6a11a82a
am:
ee0740c4d6 -s ours
am skip reason: change_id If4c8e47c2509b09e8bc1a464e1ab329b945e3d20 with SHA1
6ddff97414 is in history
Change-Id: I7315d98a6c905e915611d95364215bdc2341b4e4
Android Build Merger (Role) [Fri, 7 Jun 2019 06:34:22 +0000 (06:34 +0000)]
Merge "Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1 am:
dc29b325a1" into qt-r1-dev-plus-aosp
George Chang [Fri, 7 Jun 2019 06:34:09 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1
am:
dc29b325a1
Change-Id: I8a8ce7b773a0c5fa6ead761f288263fe7133ac1c
George Chang [Fri, 7 Jun 2019 06:34:07 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am:
e4c2e427a1
am:
dc6a11a82a
Change-Id: Iccc2bcf6c1bec2b2ff9b3aa096ff1fb8c155f03b
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am:
e4c2e427a1
Change-Id: If4545377b7c6196027b89514a91a2b7068f1202b
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
Fix NFC state switched off every time user entered connection preferences page
NfcAirplaneModeObserver added a scenario that
switched NFC off every time a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.
GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.
Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.
Bug:
128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Merged-In: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
George Chang [Fri, 7 Jun 2019 00:09:46 +0000 (00:09 +0000)]
Merge "Fix NFC state switched off every time user entered connection preferences page"
joshmccloskey [Thu, 6 Jun 2019 23:13:59 +0000 (16:13 -0700)]
Updating colors for dark theme
Bug:
133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2
Yi Jiang [Thu, 6 Jun 2019 20:27:54 +0000 (13:27 -0700)]
Merge "Fix screen attention contextual card" into qt-r1-dev am:
03c47e7687
am:
02777d3e1b
Change-Id: I5acfcf2d99d1e5652cce1d552aa28b7369f8f516
Yi Jiang [Thu, 6 Jun 2019 20:23:32 +0000 (13:23 -0700)]
Merge "Fix screen attention contextual card" into qt-r1-dev
am:
03c47e7687
Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc
Yi Jiang [Thu, 6 Jun 2019 20:06:21 +0000 (20:06 +0000)]
Merge "Fix screen attention contextual card" into qt-r1-dev
Julia Reynolds [Thu, 6 Jun 2019 19:19:15 +0000 (12:19 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51 am:
df0fdaef74
am:
4c15fab99d
Change-Id: I0f38ea55a246e19bac8b46851fc9763fb56c811e
Julia Reynolds [Thu, 6 Jun 2019 19:10:00 +0000 (12:10 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51
am:
df0fdaef74
Change-Id: Ibed0e690dab29c78a58f694b3edc9bf9cf67cf2d
Julia Reynolds [Thu, 6 Jun 2019 19:09:23 +0000 (12:09 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51 am:
520a48070f
am:
acee80f8fe
Change-Id: I97ee10e986b760593aaa5da43932be82c400aa74
Julia Reynolds [Thu, 6 Jun 2019 19:03:55 +0000 (12:03 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am:
f58cd0fb51
am:
520a48070f
Change-Id: I66b0830dc86ee78e97541be0e4ab412eeb2457e5
Julia Reynolds [Thu, 6 Jun 2019 19:00:54 +0000 (12:00 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am:
f58cd0fb51
Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7
Julia Reynolds [Thu, 6 Jun 2019 18:55:54 +0000 (11:55 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am:
f58cd0fb51
Change-Id: I446708aba61c268375257280341a1ff5b33aa81d
Mehdi Alizadeh [Thu, 6 Jun 2019 18:51:20 +0000 (11:51 -0700)]
Updates System Navigation strings am:
14a1b19735 am:
14d77491cf
am:
769bcd2efc
Change-Id: I4aa62c5fc337b238cca13bc66c40feebd1db3432
Mehdi Alizadeh [Thu, 6 Jun 2019 18:45:57 +0000 (11:45 -0700)]
Updates System Navigation strings am:
14a1b19735 am:
cde53dc119
am:
1781d93ff3
Change-Id: If0d11e3a7ae19681a9c986e2393c677934ce9527
Mehdi Alizadeh [Thu, 6 Jun 2019 18:36:59 +0000 (11:36 -0700)]
Updates System Navigation strings am:
14a1b19735
am:
14d77491cf
Change-Id: Ifcfaaf9d57b8ee2c19c4a5a891240522457495af
TreeHugger Robot [Thu, 6 Jun 2019 18:36:57 +0000 (18:36 +0000)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
Mehdi Alizadeh [Thu, 6 Jun 2019 18:31:42 +0000 (11:31 -0700)]
Updates System Navigation strings am:
14a1b19735
am:
cde53dc119
Change-Id: Id431c8e6b12611b00af1b3e34ad7b66deddc49fa
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am:
14a1b19735
Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am:
14a1b19735
Change-Id: I86d6eab41c4c5d04d4311ce7699f55546f29cebf
Mehdi Alizadeh [Wed, 5 Jun 2019 22:34:50 +0000 (15:34 -0700)]
Updates System Navigation strings
Bug:
134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
Fix NFC state switched off every time user entered connection preferences page
NfcAirplaneModeObserver added a scenario that
switched NFC off every time a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.
GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.
Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.
Bug:
128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Julia Reynolds [Thu, 6 Jun 2019 15:18:24 +0000 (11:18 -0400)]
Silent notifs appear on lockscreen by default
Test: atest
Bug:
134613164
Change-Id: I1ee39a1302010a2a29ba6d0060f19565e41859a2
Kevin Chang [Thu, 6 Jun 2019 09:22:26 +0000 (02:22 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp am:
52482edb2b
am:
abee9d52e4
Change-Id: I91e8fb09ae80638f678408a7a19da58830473667
Kevin Chang [Thu, 6 Jun 2019 09:17:06 +0000 (02:17 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
am:
52482edb2b
Change-Id: Ifecf327f3cd13efe708e99c697afd44b13e24f74
Kevin Chang [Thu, 6 Jun 2019 09:04:42 +0000 (09:04 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
TreeHugger Robot [Thu, 6 Jun 2019 06:03:14 +0000 (06:03 +0000)]
Merge "Update OWNERS file"
Kevin Chang [Fri, 31 May 2019 07:14:47 +0000 (15:14 +0800)]
Add tutorial dialog for gesture navigation
Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture
Fixes:
133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Andy Chou [Thu, 6 Jun 2019 03:49:13 +0000 (20:49 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764 am:
768691520b
am:
bbd66147eb
Change-Id: I9792ffeb47e15e43f3b6b5cfe3d28a1b5e5cefe4
Antony Sargent [Thu, 6 Jun 2019 03:48:46 +0000 (20:48 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535 am:
2082b0e969
am:
1eccc3fff3
Change-Id: I1e6818bcd80d2e904aa085b4f27ae0434d64ed26
Andy Chou [Thu, 6 Jun 2019 03:46:46 +0000 (20:46 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764 am:
8c0d669d6e
am:
3d43db4e50
Change-Id: Icd7d4f913c47a25278d85098a84a9e789191d3b2
Antony Sargent [Thu, 6 Jun 2019 03:44:33 +0000 (20:44 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535 am:
5cdf1955f4
am:
74401c6716
Change-Id: I21b01ce978f349887f9181c840eae3a71f2c9999
Yi Jiang [Thu, 6 Jun 2019 03:40:29 +0000 (20:40 -0700)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am:
d81e2c36f6
am:
b7098b181f
Change-Id: I6cbea478176361733957adb06e63f1e9b58f1c8b
Andy Chou [Thu, 6 Jun 2019 03:29:10 +0000 (20:29 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764
am:
768691520b
Change-Id: Ic357a10b7eec9dd65562138af37be35e1d4b0c01
Antony Sargent [Thu, 6 Jun 2019 03:28:05 +0000 (20:28 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535
am:
2082b0e969
Change-Id: I2e61bb379571c03b900734ad5da03b33e2ddbc90
Andy Chou [Thu, 6 Jun 2019 03:27:25 +0000 (20:27 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am:
a9e8c50764
am:
8c0d669d6e
Change-Id: I5ff88b4ba6ff4a642834a3453438489ae2804dc2
Antony Sargent [Thu, 6 Jun 2019 03:27:01 +0000 (20:27 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am:
68a26e5535
am:
5cdf1955f4
Change-Id: I88335b8bb5cf4ac4bc4d279679d36dbd2194346f
Andy Chou [Thu, 6 Jun 2019 02:51:46 +0000 (19:51 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am:
a9e8c50764
Change-Id: I7e32848cd240b43e93533f5575202b1122620dee
Antony Sargent [Thu, 6 Jun 2019 02:51:13 +0000 (19:51 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am:
68a26e5535
Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a
Andy Chou [Thu, 6 Jun 2019 02:49:12 +0000 (19:49 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am:
a9e8c50764
Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91
Antony Sargent [Thu, 6 Jun 2019 02:47:52 +0000 (19:47 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am:
68a26e5535
Change-Id: I4d43b9a27284cf126c21ae7ab9089d2d79c0dc25
Andy Chou [Thu, 6 Jun 2019 00:35:16 +0000 (00:35 +0000)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
Antony Sargent [Thu, 6 Jun 2019 00:19:16 +0000 (00:19 +0000)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
Yi Jiang [Thu, 6 Jun 2019 00:10:30 +0000 (17:10 -0700)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
am:
d81e2c36f6
Change-Id: I34f211f8234fe883c1a646bd27f5d73ca0067463
Julia Reynolds [Wed, 5 Jun 2019 23:57:32 +0000 (16:57 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev am:
3f95fda1cf am:
559a72e27f
am:
6f0097e473
Change-Id: I2e017a0ce529907dcf2c80d1d69f2d4688d7c469
Suprabh Shukla [Wed, 5 Jun 2019 23:55:02 +0000 (16:55 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied am:
732edc3e39 am:
d879318434
am:
08ec3323c6
Change-Id: Ic54fc5079a92077424760c4c42b01a9d9c0c69e9
Anthony Han [Wed, 5 Jun 2019 23:51:22 +0000 (16:51 -0700)]
Merge "Hide color mode when unavailable" into qt-r1-dev am:
3472188437
am:
04749dce13
Change-Id: Ifd067bf50fec2df7b13aecdfe57c4a26fb15d25f
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 23:42:38 +0000 (16:42 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am:
13cbb2eea2 am:
f6ae3fa64a
am:
8dcef5f789
Change-Id: Ia842fc4a4d97af6559626d0c8aefde62199a283e
Yi Jiang [Wed, 5 Jun 2019 23:35:51 +0000 (23:35 +0000)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
Yi Jiang [Wed, 5 Jun 2019 03:14:10 +0000 (20:14 -0700)]
Fix screen attention contextual card
Bug:
134537004
Bug:
134537730
Test: Manually verified.
Test: make RunSettingsRoboTests
Change-Id: Ib5dd6444b70a5575863be985f58b48f00f505e53
Julia Reynolds [Wed, 5 Jun 2019 23:08:20 +0000 (16:08 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev am:
3f95fda1cf
am:
559a72e27f
Change-Id: I667202b439e1860d8345f5b0c9eefcfaab5af246
Suprabh Shukla [Wed, 5 Jun 2019 23:06:30 +0000 (16:06 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied am:
732edc3e39
am:
d879318434
Change-Id: I6ac28db9ba20bd4b0d002094454e6200811aa035
Anthony Han [Wed, 5 Jun 2019 23:04:34 +0000 (16:04 -0700)]
Merge "Hide color mode when unavailable" into qt-r1-dev
am:
3472188437
Change-Id: I434297d5c0c7332270195df48554fdf45f65a251
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 22:59:29 +0000 (15:59 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am:
13cbb2eea2
am:
f6ae3fa64a
Change-Id: I5a5e42a31c62f8c3b2150cd44d16aa6228f77d24
Julia Reynolds [Wed, 5 Jun 2019 21:59:20 +0000 (14:59 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev am:
3f95fda1cf am:
9994b66974
am:
918fbfb364
Change-Id: Ibf4b20764cd8aa1d34600fc215836db15a78bd7a
Julia Reynolds [Wed, 5 Jun 2019 21:55:20 +0000 (14:55 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev am:
3f95fda1cf
am:
9994b66974
Change-Id: Ibbc9edc50bd13fc8c4e8a8f3cd819c3beea99881
Julia Reynolds [Wed, 5 Jun 2019 21:49:45 +0000 (14:49 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev
am:
3f95fda1cf
Change-Id: Icc507ca10f4c657593ed1c6b6cb9d93c0b01f8fe
Julia Reynolds [Wed, 5 Jun 2019 21:49:41 +0000 (14:49 -0700)]
Merge "Read the subtext of notif importance field on selection" into qt-dev
am:
3f95fda1cf
Change-Id: I5829b1539c480e5c2f3598c57eb5bde7cdcd4d5f
Suprabh Shukla [Wed, 5 Jun 2019 21:47:47 +0000 (14:47 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied am:
732edc3e39 am:
4929001e70
am:
e5d958cb0a
Change-Id: I8260ef8790cc455a1025b35a07681cfb80b96ba9
Suprabh Shukla [Wed, 5 Jun 2019 21:40:44 +0000 (14:40 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied am:
732edc3e39
am:
4929001e70
Change-Id: Id759c1c02118401c6213f43cd21134267fc10740
TreeHugger Robot [Wed, 5 Jun 2019 21:37:17 +0000 (21:37 +0000)]
Merge "Read the subtext of notif importance field on selection" into qt-dev
Suprabh Shukla [Wed, 5 Jun 2019 21:34:46 +0000 (14:34 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied
am:
732edc3e39
Change-Id: Id88443ad3face92fa3d28622207c49f94c7eb002
Suprabh Shukla [Wed, 5 Jun 2019 21:34:45 +0000 (14:34 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied
am:
732edc3e39
Change-Id: I891d88a7fa0769ce22eb7b79cb5f6dcf5d1457ac
Antony Sargent [Wed, 5 Jun 2019 21:16:48 +0000 (14:16 -0700)]
Strings for pSIM on/off toggle removal
We need to remove the on/off toggle for pSIMs because of unexpected
problems in the telephony stack with being able to disable a pSIM. These
new strings are used in the updated UX we're adding to deal with this.
Bug:
132921553
Test: n/a
Change-Id: I60816289e0ef65bbf882a8dca6f08c46742bb1c9
Suprabh Shukla [Fri, 31 May 2019 20:45:59 +0000 (13:45 -0700)]
Kill uid when REQUEST_INSTALL_PACKAGES is denied
Process privileges like open fds need to be revoked, when this
permission is denied by the user.
Test: Manually verified by checking logs.
Robotest:
atest SettingsRoboTests:ExternalSourcesDetailsTest
Bug:
133504844
Change-Id: I81da0b3a5d6c54e392828829d1a2c43488439504
TreeHugger Robot [Wed, 5 Jun 2019 20:25:31 +0000 (20:25 +0000)]
Merge "Hide color mode when unavailable" into qt-r1-dev
Yi Jiang [Tue, 4 Jun 2019 19:08:42 +0000 (12:08 -0700)]
use different description strings for screen attention settings and contextual card
1. Revert the screen attention description string to the old approved
string.
2. Create a new summary string for 'Screen Attention' contextual slice.
3. Fix some character issues.
Bug:
134457354
Bug:
134585794
Test: make RunSettingsRoboTests -j 32
Change-Id: I401fc6707203790e51aed8738b4658c6a30f512e
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:49:35 +0000 (11:49 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am:
13cbb2eea2 am:
226715e54e
am:
b55caa7afc
Change-Id: I7d5c7d1715a558d281851e54b44ee915d6f41bd5
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:35:09 +0000 (11:35 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev am:
13cbb2eea2
am:
226715e54e
Change-Id: I64ef08b8d8b5215a20017e70f36678d4f2d8c510
Julia Reynolds [Wed, 5 Jun 2019 18:07:50 +0000 (14:07 -0400)]
Read the subtext of notif importance field on selection
When using a11y services
Test: manual with Talkback
Bug:
133649570
Change-Id: Ic68a948ab5d55e68994e6b14456d25d438637886
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:21:33 +0000 (11:21 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am:
13cbb2eea2
Change-Id: I8ba31e7278d911bf6cef19e46d06ed964ae9e36f
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:21:32 +0000 (11:21 -0700)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
am:
13cbb2eea2
Change-Id: I9b9799889ce5e3474ccfcdd4b33dfafcd0092e0e
Xiangyu/Malcolm Chen [Wed, 5 Jun 2019 18:03:17 +0000 (18:03 +0000)]
Merge "Triggering notifications when dual CDMA SIM combinations are detected" into qt-dev
Anthony Han [Fri, 24 May 2019 23:46:40 +0000 (16:46 -0700)]
Hide color mode when unavailable
When no color modes are available, make the setting unsearchable.
Bug:
131035509
Test: make ROBOTEST_FILTER="(ColorMode*)" RunSettingsRoboTests
Change-Id: I2dca681b981b646858c3ae1af4fafbee74fd06ee
Edgar Wang [Wed, 5 Jun 2019 15:46:33 +0000 (08:46 -0700)]
Merge "New strings for "Automatically lock"" into qt-r1-dev am:
19eaefb17e
am:
1d9a0ec5f4
Change-Id: I3acd5eb888cfe50c087db6757eee4affa76cb581
Edgar Wang [Wed, 5 Jun 2019 15:40:30 +0000 (08:40 -0700)]
Merge "New strings for "Automatically lock"" into qt-r1-dev
am:
19eaefb17e
Change-Id: I83d75e232242340a20d006ccfa2697ef4d6301a1
TreeHugger Robot [Wed, 5 Jun 2019 15:30:52 +0000 (15:30 +0000)]
Merge "New strings for "Automatically lock"" into qt-r1-dev
TreeHugger Robot [Wed, 5 Jun 2019 12:29:31 +0000 (12:29 +0000)]
Merge "Fix BatteryTipDialogFragmentTest"
Pasty Chang [Wed, 5 Jun 2019 12:10:49 +0000 (12:10 +0000)]
Merge "Fix overlapped text in lockscreen pattern setup"
tmfang [Wed, 5 Jun 2019 09:24:16 +0000 (17:24 +0800)]
Fix BatteryTipDialogFragmentTest
Test case can't get application info. We add test app information
in packagemanager in setup().
Test: atest BatteryTipDialogFragmentTest
Fixes:
134451831
Change-Id: I687f5f3a52ba8af346dbd0d798e4eee34a583870
Raff Tsai [Wed, 5 Jun 2019 09:48:08 +0000 (02:48 -0700)]
Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours am:
3e1ae79428 -s ours am:
64d4433a90 -s ours am:
acac31e75a -s ours am:
b1e65ea2af -s ours
am:
7879a05148 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I8ef28c25fbdd3879a7d56f4f1e1486758446f223
Raff Tsai [Wed, 5 Jun 2019 09:47:30 +0000 (02:47 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours am:
3e1ae79428 -s ours am:
64d4433a90 -s ours am:
acac31e75a -s ours am:
c212052f69 -s ours
am:
4994dfff37 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I2362b0023cb47997d68361bbd95059a2fec0a8ac
Raff Tsai [Wed, 5 Jun 2019 09:47:05 +0000 (02:47 -0700)]
Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
8c612b1334 -s ours am:
80fea5de92 -s ours am:
5a326027db -s ours am:
ba0122401d -s ours am:
290b4e507c -s ours am:
723fb8dc91 -s ours
am:
f376fc4ecc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I2c9d46d7f1a73e825283797ecd8aeccfee8834f1
Raff Tsai [Wed, 5 Jun 2019 09:46:34 +0000 (02:46 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
8c612b1334 -s ours am:
80fea5de92 -s ours am:
5a326027db -s ours am:
ba0122401d -s ours am:
290b4e507c -s ours am:
592e5c1491 -s ours
am:
433adc9043 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I5697c7185cca74e551b21783af668344ba3e4e72
Raff Tsai [Wed, 5 Jun 2019 09:46:03 +0000 (02:46 -0700)]
[automerger skipped] Merge changes from topic "am-
7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
am:
e1e01667a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I3328670fc4b4f89dcbaf0c2639713dde041e807b
Raff Tsai [Wed, 5 Jun 2019 09:45:12 +0000 (02:45 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours am:
e7c298885b -s ours am:
ca593c204a -s ours am:
a9125587a4 -s ours
am:
f12bc63c3c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ife2bf0bf4c0175303fe86b38b5c968f865637bac
Raff Tsai [Wed, 5 Jun 2019 09:44:58 +0000 (02:44 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours am:
f7cd796ea8 -s ours am:
7a7a4f3019 -s ours
am:
e944a78e21 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I957f4e60b93eb0d23c7aead82978f164a2264923
Raff Tsai [Wed, 5 Jun 2019 09:44:42 +0000 (02:44 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours am:
ab2ad075b3 -s ours am:
a33cd2c168 -s ours
am:
012a9daccb -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ibe0fba561ca4a86334dce41691993b9b3cadaab8
Android Build Merger (Role) [Wed, 5 Jun 2019 09:41:28 +0000 (09:41 +0000)]
Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours am:
3e1ae79428 -s ours am:
64d4433a90 -s ours am:
acac31e75a -s ours am:
b1e65ea2af -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history" into qt-r1-dev-plus-aosp
Raff Tsai [Wed, 5 Jun 2019 09:41:18 +0000 (02:41 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours am:
3e1ae79428 -s ours am:
64d4433a90 -s ours am:
acac31e75a -s ours
am:
b1e65ea2af -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I52161c8578ef4d869b460450291d6bc3ee083431
Raff Tsai [Wed, 5 Jun 2019 09:41:11 +0000 (02:41 -0700)]
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am:
09e255676b -s ours am:
14302b3ac6 -s ours am:
3e1ae79428 -s ours am:
64d4433a90 -s ours am:
acac31e75a -s ours
am:
c212052f69 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
5d9328571e is in history
Change-Id: I2e5316c8cb6737a74798cc9e6cfe0710d87e45e1
OSDN Git Service
