Commit Graph

307978 Commits

Author SHA1 Message Date
phweiss
e398331ee0 Remove Quicksettings footer in QuickQSPanel
Before this cl, the footer was normally invisible, except if the user
removed all tiles in quick settings, then it looks broken (see bug).
Now the area is blank.

Bug: b/35381410
Test: manually

Change-Id: I104a46cfe396c7d44704505cebe41066d26866c4
2017-02-17 17:06:27 +00:00
TreeHugger Robot
bae3d7083f Merge "Spline: Fix monotonicity constraint" 2017-02-17 14:53:29 +00:00
Wyatt Riley
cd52950a9e Merge "Common code for 4 jni Location conversions" 2017-02-17 14:40:29 +00:00
TreeHugger Robot
91e5d7fa99 Merge "Remove locked user tasks if starting overlay fails" 2017-02-17 13:40:43 +00:00
sj.cha
4205057104 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8 am: 3b92631a69 am: 10957727f5
am: 395f0de0dc

Change-Id: Ib7e586a778c6fb9b920f0790e4b343c122250bb7
2017-02-17 13:32:07 +00:00
sj.cha
395f0de0dc Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8 am: 3b92631a69
am: 10957727f5

Change-Id: I5e0faee7a0b1c6bdfafe77560a91e999f40edc4a
2017-02-17 13:27:04 +00:00
sj.cha
10957727f5 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8
am: 3b92631a69

Change-Id: I82c297e654af6690c6a3be216a0da08a3aff5b9d
2017-02-17 13:21:34 +00:00
sj.cha
3b92631a69 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN"
am: 1a69570fe8

Change-Id: I21a69eb02b13b20f66996836d54b8aadadfa80ec
2017-02-17 13:17:00 +00:00
Treehugger Robot
1a69570fe8 Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" 2017-02-17 13:07:21 +00:00
TreeHugger Robot
df31649933 Merge "Backup service APIs not available on parent profile instance" 2017-02-17 12:06:33 +00:00
TreeHugger Robot
08a2dd12bb Merge "Defer readSessionsLocked until system ready" 2017-02-17 10:51:06 +00:00
Robin Lee
1d996bd7fc Remove locked user tasks if starting overlay fails
This is a more graceful failure case than giving up and just letting
the task show unmodified on the screen if something goes wrong.

Test: runtest -x WorkLockActivityControllerTest.java
Bug: 31001762
Fix: 31064912
Change-Id: I505c00f411f41fb927c31d2280bdeda69e15b4d4
2017-02-17 10:48:43 +00:00
Clara Bayarri
1a8904abee Merge "Use weight & style data for fonts from xml source" 2017-02-17 10:39:53 +00:00
Bill Yi
b97ce9eb47 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d4177b8610 -s ours
am: 53c71a90fb  -s ours

Change-Id: Ibc881b5f7161b876de104aece3ffdb133389b0e2
2017-02-17 10:29:48 +00:00
Bill Yi
53c71a90fb Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: d4177b8610  -s ours

Change-Id: I73ba26823b2c27cf1f492558bf6b7c176c296282
2017-02-17 10:24:43 +00:00
TreeHugger Robot
d4177b8610 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-17 10:16:42 +00:00
Shreyas Basarge
4edbf055ed Merge "Use separate message ids for backup and restore operations" 2017-02-17 10:14:50 +00:00
Esteban Talavera
5b7f2d0858 Backup service APIs not available on parent profile instance
Bug: 35432611
Test:  cts-tradefed run cts-dev --module DevicePolicyManager --test  com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
Change-Id: Ia1621183dee17dcd183a668f1714b563f79e5b17
2017-02-17 09:45:24 +00:00
TreeHugger Robot
6fd0e8d5d4 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:39:51 +00:00
TreeHugger Robot
5cf832c5ae Merge "Import translations. DO NOT MERGE" 2017-02-17 09:38:47 +00:00
TreeHugger Robot
956edcafe4 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:38:07 +00:00
TreeHugger Robot
0478678634 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:32:53 +00:00
TreeHugger Robot
ec8a096d59 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:30:16 +00:00
TreeHugger Robot
c5f6c336d5 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:28:39 +00:00
Bill Yi
385ae1a01a Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d74b5f551d -s ours
am: 5871f5ec47  -s ours

Change-Id: Ide5be834d46fe28c499382b756a64530881ac883
2017-02-17 09:23:42 +00:00
Bill Yi
5871f5ec47 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: d74b5f551d  -s ours

Change-Id: Iffab34c61046aeeca37a906107f4183952156654
2017-02-17 09:19:10 +00:00
TreeHugger Robot
d74b5f551d Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-17 09:10:42 +00:00
TreeHugger Robot
5dd1308bbc Merge "Fix duplicate calls of IMS#doStartInput()" 2017-02-17 08:24:47 +00:00
TreeHugger Robot
a722a2ea38 Merge "Add missing transitive dependencies" 2017-02-17 05:19:05 +00:00
Bill Yi
94a1e0fca6 Import translations. DO NOT MERGE
Change-Id: Ia854a721fe3df7212deb75df8ab7c4adb5b531c1
Auto-generated-cl: translation import
2017-02-16 21:18:39 -08:00
Bill Yi
deb08a3096 Import translations. DO NOT MERGE
Change-Id: I80580cf6ece02cc20f4cda744f2b3599ec3985cd
Auto-generated-cl: translation import
2017-02-16 21:09:53 -08:00
Bill Yi
3e97f5c9ca Import translations. DO NOT MERGE
Change-Id: Id1a24d5bd8306f602f6cd6e42fe7ca70c1e2c750
Auto-generated-cl: translation import
2017-02-16 20:55:10 -08:00
Jerry Zhang
9c78253b75 Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03 am: 35f8d6cfd0
am: fba74d6c61

Change-Id: I190467cba81aca56f32a0a6ff6d8e798e1e7ac30
2017-02-17 04:41:32 +00:00
Jack Yu
535ee425c1 Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4 am: bf21df3306 am: 8c89daceaf
am: 3edeec530f  -s ours

Change-Id: I4b91dd6796986c8f00574360fcb47a40996dac03
2017-02-17 04:34:50 +00:00
Bill Yi
db067b2c4d Import translations. DO NOT MERGE
Change-Id: I5c7c9644748b50c15eeda5bc0c6c1505d309cdeb
Auto-generated-cl: translation import
2017-02-16 20:09:24 -08:00
Bill Yi
ec5916d9de Import translations. DO NOT MERGE
Change-Id: Ia9de3c96be0035fbe45cabec9300b19acde07e80
Auto-generated-cl: translation import
2017-02-16 20:06:15 -08:00
TreeHugger Robot
ec453e0106 Merge "Remove nested preference from its parent." 2017-02-17 04:01:41 +00:00
Bill Yi
8a934a2454 Import translations. DO NOT MERGE
Change-Id: I3fb0605acf60b1bed44058c9013d6e7ed3c9b3f0
Auto-generated-cl: translation import
2017-02-16 19:52:15 -08:00
Bill Yi
17ebc1fe0f Import translations. DO NOT MERGE
Change-Id: I7ef099237bb5000aa94cbab1bf6e671600c97239
Auto-generated-cl: translation import
2017-02-16 19:46:21 -08:00
TreeHugger Robot
48d47505eb Merge "Update visibility logic in realStartActivityLocked" 2017-02-17 03:44:36 +00:00
Bill Yi
e625669da0 Import translations. DO NOT MERGE
Change-Id: Ie60c04fad3648eaa921149e432de426a9a60db5c
Auto-generated-cl: translation import
2017-02-16 19:42:59 -08:00
TreeHugger Robot
876f266271 Merge "Fix AccountManagerService caused by empty package names list." 2017-02-17 02:31:29 +00:00
Jerry Zhang
fba74d6c61 Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03
am: 35f8d6cfd0

Change-Id: I10c0be37b583f1670cb98e926aefb9dc8b986843
2017-02-17 02:24:44 +00:00
Jerry Zhang
35f8d6cfd0 Merge changes from topic 'svcusb' am: 5e2a2ee39e
am: 6f44072d03

Change-Id: Ic30bca41e088c2d077dc5aa09e373a02acb60be6
2017-02-17 02:16:11 +00:00
TreeHugger Robot
d2bd42e736 Merge "Add Secure setting for the assist gesture." 2017-02-17 02:12:58 +00:00
Jerry Zhang
6f44072d03 Merge changes from topic 'svcusb'
am: 5e2a2ee39e

Change-Id: I4b628b80e348e25377d0855301374e71cb8f2c64
2017-02-17 02:11:45 +00:00
TreeHugger Robot
1ad4f0e60b Merge "Adds @hide ImsService APIs" 2017-02-17 02:09:48 +00:00
Treehugger Robot
5e2a2ee39e Merge changes from topic 'svcusb'
* changes:
  Add data unlock argument to set function command.
  Allow the shell to set USB functions.
2017-02-17 02:01:55 +00:00
Bill Yi
1c1c4979c6 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f54038169c -s ours
am: f1442845c3  -s ours

Change-Id: Ife71c182778ed061acae6ec5efd440309cd8a553
2017-02-17 02:00:16 +00:00
Hugo Benichi
ab7cab4ac2 Merge "resolve merge conflicts of 9355bce0c3 to master" 2017-02-17 01:53:57 +00:00