jackqdyulei
ac49ccedb7
Suspend action in security patch when browser is disabled am: 013da34209
...
am: 221b9157b4
Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4
2016-10-18 17:09:15 +00:00
Lei Yu
b4969f5b6f
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
...
am: 7fee46383f
Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
2016-10-18 16:54:04 +00:00
jackqdyulei
221b9157b4
Suspend action in security patch when browser is disabled
...
am: 013da34209
Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
2016-10-18 16:54:03 +00:00
Lei Yu
7fee46383f
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
2016-10-18 16:45:35 +00:00
Bill Yi
79a4b3160d
Import translations. DO NOT MERGE am: 6515783df6
-s ours am: 37c5dd0fe3
-s ours
...
am: a95e430c93
-s ours
Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23
2016-10-18 05:49:41 +00:00
Bill Yi
cda385e996
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b
-s ours
...
am: 987866df87
-s ours
Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf
2016-10-18 05:49:22 +00:00
Bill Yi
3e664455dc
Import translations. DO NOT MERGE am: ccde0787b8
-s ours
...
am: 4367ed325e
-s ours
Change-Id: I10c8b1a9a393fa87343ebc2802232f246357b9b8
2016-10-18 05:49:02 +00:00
Bill Yi
a95e430c93
Import translations. DO NOT MERGE am: 6515783df6
-s ours
...
am: 37c5dd0fe3
-s ours
Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
2016-10-18 05:40:29 +00:00
Bill Yi
987866df87
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 5ffabbe58b
-s ours
Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf
2016-10-18 05:40:02 +00:00
Bill Yi
4367ed325e
Import translations. DO NOT MERGE
...
am: ccde0787b8
-s ours
Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109
2016-10-18 05:40:01 +00:00
Bill Yi
37c5dd0fe3
Import translations. DO NOT MERGE
...
am: 6515783df6
-s ours
Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894
2016-10-18 05:37:33 +00:00
TreeHugger Robot
5ffabbe58b
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-18 05:30:53 +00:00
jackqdyulei
013da34209
Suspend action in security patch when browser is disabled
...
When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.
Bug: 32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.
Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10
2016-10-17 14:35:15 -07:00
Adrian Roos
82829ee0b1
Separate ambient display triggers
...
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.
Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
2016-10-17 14:05:53 -07:00
Bill Yi
6515783df6
Import translations. DO NOT MERGE
...
Change-Id: Ib4de644f9065e553dfd28458421aaba309a41de5
Auto-generated-cl: translation import
2016-10-17 13:26:38 -07:00
Doris Ling
b4a122b227
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am: ec5314f2f5
...
am: 1a674eef53
Change-Id: I5fe058f76e3a7061fc78fe02294f0cd802534cde
2016-10-17 20:24:34 +00:00
Doris Ling
fccee6adae
Add static preview images to gesture settings. am: 12e4bebabf
...
am: df7b815980
Change-Id: I56c1f9368bb762e400e0a071e72dd175351a7696
2016-10-17 20:24:26 +00:00
Bill Yi
ccde0787b8
Import translations. DO NOT MERGE
...
Change-Id: I85609bede92b4ae044f1f98a101576447f93367f
Auto-generated-cl: translation import
2016-10-17 13:21:09 -07:00
Doris Ling
1a674eef53
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
...
am: ec5314f2f5
Change-Id: Ib195aa98f9838ceffc27255e34b18e2bdfbccbff
2016-10-17 20:18:33 +00:00
Doris Ling
df7b815980
Add static preview images to gesture settings.
...
am: 12e4bebabf
Change-Id: I4f5f16b109c4997b15b93320945bbb3ccab06735
2016-10-17 20:18:30 +00:00
Doris Ling
ec5314f2f5
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
2016-10-17 20:11:31 +00:00
Sanket Padawe
a049c988e7
Fix multi-sim popup issue in data usage. am: 8591f26fa3
...
am: d8fc77122b
Change-Id: Idbe5e19e8ce5660e4a056b28917fccca5477cc9e
2016-10-17 17:25:04 +00:00
Sanket Padawe
d8fc77122b
Fix multi-sim popup issue in data usage.
...
am: 8591f26fa3
Change-Id: If23388f4fb2211af239aef7043cceb2ec2dd13e8
2016-10-17 17:18:34 +00:00
Sanket Padawe
8591f26fa3
Fix multi-sim popup issue in data usage.
...
+ Avoid sending popup dialog when data is enabled on currently active
data sim.
Bug: 31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
2016-10-14 15:41:52 -07:00
Bill Yi
680138830a
Import translations. DO NOT MERGE am: 43920d3ba5
-s ours am: 1146d6375c
-s ours
...
am: 11d7cba3b2
-s ours
Change-Id: I4a666011cda0542627d55677ed4bbe26378e2804
2016-10-14 09:29:39 +00:00
Bill Yi
77f8f43e79
Import translations. DO NOT MERGE am: 18a64f201b
-s ours
...
am: fceb2818d6
-s ours
Change-Id: I5bc44f819b0dcc27aa5dcd411bed23eda90ec733
2016-10-14 09:29:25 +00:00
Bill Yi
11d7cba3b2
Import translations. DO NOT MERGE am: 43920d3ba5
-s ours
...
am: 1146d6375c
-s ours
Change-Id: I973f3606e3f7427f74c9af29d58ba0611b865704
2016-10-14 09:22:56 +00:00
Bill Yi
1146d6375c
Import translations. DO NOT MERGE
...
am: 43920d3ba5
-s ours
Change-Id: I72f1d361a29a4391c33c5fd0fb8a3340287314f9
2016-10-14 09:21:26 +00:00
Bill Yi
fceb2818d6
Import translations. DO NOT MERGE
...
am: 18a64f201b
-s ours
Change-Id: I91b138778b8488b63afa11c1c6625f7a72acbd62
2016-10-14 09:20:40 +00:00
Bill Yi
43920d3ba5
Import translations. DO NOT MERGE
...
Change-Id: Ia1b89602b4538d719cf4b4c2285290598a9d60f6
Auto-generated-cl: translation import
2016-10-13 15:35:00 -07:00
Bill Yi
18a64f201b
Import translations. DO NOT MERGE
...
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
2016-10-13 15:30:06 -07:00
Qi Ding
051c1b298d
Merge "Fix searched item isn't highlighted" am: 363c529dc6
am: 1d07de566d
...
am: 85768b3723
Change-Id: I7bb1c3b3a5dbb1ee4e6d8934a7be542076d1e863
2016-10-13 01:34:08 +00:00
Qi Ding
85768b3723
Merge "Fix searched item isn't highlighted" am: 363c529dc6
...
am: 1d07de566d
Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06
2016-10-13 01:28:00 +00:00
Qi Ding
1d07de566d
Merge "Fix searched item isn't highlighted"
...
am: 363c529dc6
Change-Id: I57e09b8403422338c80bd369d41822bf26383361
2016-10-13 01:19:49 +00:00
Treehugger Robot
363c529dc6
Merge "Fix searched item isn't highlighted"
2016-10-13 01:13:41 +00:00
Daniel Sandler
95e41c7bc3
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev am: 0f6ae3aa87
...
am: 93622202d3
Change-Id: I8fa5d3437be488fa3c5f1d57a2032636d4fcd6b1
2016-10-12 13:58:04 +00:00
Dan Sandler
67d326d2b4
Suppress notif block/silence settings for essential packages. am: acf763e996
...
am: 80df316ac4
Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92
2016-10-12 13:57:49 +00:00
Daniel Sandler
93622202d3
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
...
am: 0f6ae3aa87
Change-Id: I87fbb0cd4c462a7df76e2f5719aafc54ee671076
2016-10-12 13:51:05 +00:00
Dan Sandler
80df316ac4
Suppress notif block/silence settings for essential packages.
...
am: acf763e996
Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
2016-10-12 13:51:04 +00:00
Daniel Sandler
0f6ae3aa87
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
2016-10-12 13:38:56 +00:00
Doris Ling
dc9ea4ceff
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am: 49c0bab8bf
...
am: 739a261295
Change-Id: I25ceb867e68720f22405a944669c5fc9ca3570f4
2016-10-12 00:36:05 +00:00
Doris Ling
ef980e4dd1
Remove pickup gesture settings if sensor is not found. am: 94e0da52fc
...
am: 79aa718669
Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0
2016-10-12 00:35:58 +00:00
Doris Ling
739a261295
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
...
am: 49c0bab8bf
Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99
2016-10-12 00:23:48 +00:00
Doris Ling
79aa718669
Remove pickup gesture settings if sensor is not found.
...
am: 94e0da52fc
Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
2016-10-12 00:23:46 +00:00
Doris Ling
12e4bebabf
Add static preview images to gesture settings.
...
Set the animation preview image view to the newly added preview image
instead of loading it from animation video.
Test: manual - launch gesture settings and visually check the animation
preview images.
Bug: 31636637
Change-Id: If25a0e3501bea0c6343326a143d665ec79e3d7c7
2016-10-11 16:44:58 -07:00
Doris Ling
49c0bab8bf
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
2016-10-11 23:42:42 +00:00
Doris Ling
94e0da52fc
Remove pickup gesture settings if sensor is not found.
...
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.
Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.
Bug: 32072298
Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
2016-10-11 14:23:59 -07:00
Nick Kralevich
ff4ba8ae6f
Merge "Delete "Show CPU usage"" into nyc-mr1-dev am: 09d3961326
...
am: 2c89007df6
Change-Id: Iaddfa85f013b44648b12fed164e26d02251471fc
2016-10-11 18:28:05 +00:00
Nick Kralevich
a5a5ebfe5d
Delete "Show CPU usage" am: 73dfef91b2
...
am: 0f3067ce58
Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715
2016-10-11 18:14:34 +00:00
Nick Kralevich
2c89007df6
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
...
am: 09d3961326
Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819
2016-10-11 18:14:06 +00:00