Ajay Panicker
70b3e38772
Merge "Make sure that the device name is not null before returning it" am: d4963e8035 am: 87d114ac3e
...
am: c6438a68d6
Change-Id: I90c31e9f1c304d6696908d3518c3e96940fea8f6
2017-04-04 01:42:47 +00:00
Ajay Panicker
c6438a68d6
Merge "Make sure that the device name is not null before returning it" am: d4963e8035
...
am: 87d114ac3e
Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7
2017-04-04 01:35:05 +00:00
Ajay Panicker
87d114ac3e
Merge "Make sure that the device name is not null before returning it"
...
am: d4963e8035
Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225
2017-04-04 01:27:41 +00:00
Jason Monk
6c04503fce
Merge "Add some strings that will be needed for QS changes" into oc-dev
...
am: f2764a4aed
Change-Id: Id89770140b8cac1ec746aff6a9c1fd4049449254
2017-04-04 00:43:33 +00:00
TreeHugger Robot
f2764a4aed
Merge "Add some strings that will be needed for QS changes" into oc-dev
2017-04-04 00:35:41 +00:00
Jesse Evans
daa4b22f45
Merge "Adds appropriate filtering for instant apps" into oc-dev
...
am: de5be11955
Change-Id: I7c4ea3c1bfcefa59cf0abedc3c5c1d8ec8effa08
2017-04-04 00:04:29 +00:00
TreeHugger Robot
de5be11955
Merge "Adds appropriate filtering for instant apps" into oc-dev
2017-04-03 23:55:19 +00:00
Jason Monk
5383f72840
Add some strings that will be needed for QS changes
...
Test: make
Bug: 34765805
Change-Id: I8824314ffe7c91502dc6b516506a98507cdf03ab
2017-04-03 18:27:01 -04:00
Ajay Panicker
c2c4efd137
Make sure that the device name is not null before returning it
...
Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c
2017-04-03 20:21:14 +00:00
Winson Chung
04475bfa2c
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev
...
am: 3f2bbcbe92
Change-Id: I748b00c12872baa61280a20d354da49766fcf837
2017-04-03 19:26:31 +00:00
Winson Chung
3f2bbcbe92
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev
2017-04-03 19:22:57 +00:00
Stephen Chen
aa0b33f065
Merge "Add friction icon for metered networks." into oc-dev
...
am: 38344ac4e9
Change-Id: I4edf3bd9367de701ea3f161a0ff461d47e216186
2017-04-03 18:40:19 +00:00
Winson Chung
3152f5b4e6
Merge "Fixing regression in PiP TV." into oc-dev
...
am: 244e4854c3
Change-Id: Id0d758849c8838f9f43958e43978246b9b8c5cec
2017-04-03 18:33:50 +00:00
TreeHugger Robot
38344ac4e9
Merge "Add friction icon for metered networks." into oc-dev
2017-04-03 18:24:02 +00:00
Winson Chung
244e4854c3
Merge "Fixing regression in PiP TV." into oc-dev
2017-04-03 18:22:41 +00:00
Jason Monk
3184cfce76
Merge "Disable sounds on menu button" into oc-dev
...
am: 5c8832a983
Change-Id: I16aef7e38de6a154d051f539b9fc8c96db73958a
2017-04-03 18:02:26 +00:00
Jason Monk
17e605aae8
Merge "Fix battery icon dark initialization" into oc-dev
...
am: cb4ed821f2
Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290
2017-04-03 18:01:17 +00:00
Jason Monk
f6e22d4f36
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
...
am: a56b6e530a
Change-Id: I43f7dafe192930ce5f3a78db5e586d62ba66a1c4
2017-04-03 17:51:00 +00:00
Jason Monk
5c549b3a2a
Merge "Fix losing status bar icons on config changes" into oc-dev
...
am: f244f7e1b8
Change-Id: I08a75d88e6764703d4c450b9ee5f81a824e2adc9
2017-04-03 17:49:45 +00:00
Winson Chung
c3545d3dc4
Fix menu visibility while updating dismiss fraction.
...
Bug: 36225602
Test: Enter PIP, move, tap field to show IME
Change-Id: Idf47728a2fa40703e4e68b2cc0925167b8e80c0c
2017-04-03 10:44:57 -07:00
Jason Monk
4209e9d739
Merge "Switch cast over to support library dialog" into oc-dev
...
am: de8cd0e8f5
Change-Id: I997130142d426967d60e9c384056c3aba1ea5af5
2017-04-03 17:38:57 +00:00
Jeff Sharkey
f9f7d71cc5
Merge "We really want f_frsize and f_bavail." into oc-dev
...
am: fd463121c6
Change-Id: I55aebb3b452f4d41af7e5f54d0dff27e9bc6cca6
2017-04-03 17:27:48 +00:00
TreeHugger Robot
5c8832a983
Merge "Disable sounds on menu button" into oc-dev
2017-04-03 16:37:49 +00:00
TreeHugger Robot
cb4ed821f2
Merge "Fix battery icon dark initialization" into oc-dev
2017-04-03 16:37:11 +00:00
Winson Chung
d62acec309
Fixing regression in PiP TV.
...
- Don't clobber the state if we are deferring resizing due to finishing
activities.
- Fix issue with PiP tasks being visible after the stack is removed, due
to it being put below a non-fullscreen task in the fullscreen stack.
Instead just move it to the back of the stack.
Bug: 36592307
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ia18fe155b8a045a8ffea84612fd08af3ef3982d8
2017-04-03 09:30:42 -07:00
TreeHugger Robot
a56b6e530a
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
2017-04-03 15:37:18 +00:00
TreeHugger Robot
f244f7e1b8
Merge "Fix losing status bar icons on config changes" into oc-dev
2017-04-03 15:05:38 +00:00
Jason Monk
de8cd0e8f5
Merge "Switch cast over to support library dialog" into oc-dev
2017-04-03 13:34:19 +00:00
Jeff Sharkey
dafb17e7eb
We really want f_frsize and f_bavail.
...
It's confusing, but f_bsize is not the value you're looking for; the
real block size is f_frsize. Fix all those bugs.
Also, the vast majority of clients are interested in the usable
disk space, not including reserved space.
Test: builds, boots
Bug: 36840579
Change-Id: Ib1470389afd49c14cab62282ec1e978ebb2c4791
2017-04-02 23:33:38 -06:00
TreeHugger Robot
8f59f867f9
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-03 02:11:44 +00:00
Jesse Evans
13be12e314
Adds appropriate filtering for instant apps
...
Adds a new filter that includes downloaded and launcher apps, as well
as instant apps, and ensured that instant apps do not appear where
they previously were not expected (downloaded and launcher apps).
Test: Added testing for the existing filter and the new one.
Bug: 36515324
Change-Id: I7ef94442bae14ee18d4b4d70f04f9bf62af9eff8
(cherry picked from commit a4e0356ed48021c353a6964ec8ea4c6b55006282)
2017-04-02 16:10:22 +00:00
TreeHugger Robot
bcd194eb04
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:44:23 +00:00
TreeHugger Robot
1058478d5b
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:43:38 +00:00
TreeHugger Robot
69dd99c741
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:42:58 +00:00
TreeHugger Robot
e1a2ddeee8
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:42:16 +00:00
TreeHugger Robot
45d02673c5
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:41:39 +00:00
TreeHugger Robot
ae1e284380
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:41:09 +00:00
TreeHugger Robot
0bbfc26ecb
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:39:48 +00:00
TreeHugger Robot
f13c6c2a4c
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:39:18 +00:00
TreeHugger Robot
89a5b41395
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:38:49 +00:00
TreeHugger Robot
4bac557350
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:38:25 +00:00
TreeHugger Robot
68a2d1d674
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:36:21 +00:00
Bill Yi
199c7eef87
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: Id8d5a50ec7d04eb45dd55d333a178b9a214d05d5
2017-04-01 23:06:04 -07:00
Bill Yi
6bd43afc95
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I967ca7ee9e12c4bc83e8bd4bcf9eec0cce0ed031
2017-04-01 23:02:20 -07:00
Bill Yi
01a086c264
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I896e874391b7951f14ccb3138c21399d4dd0a6e6
2017-04-01 22:30:30 -07:00
Bill Yi
9b255d0469
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I8fe57933ecbc106945b72f306cd10346e4b754a9
2017-04-01 22:26:48 -07:00
Bill Yi
88dcda2258
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I6b319f5bbeccf3aeb0b8e68279add98a03389dea
2017-04-01 22:23:03 -07:00
Bill Yi
8e2343f9fb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: Ib67a94c0268dbfcf32025179010422410b19157e
2017-04-01 22:19:25 -07:00
Bill Yi
e3543a8066
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: Ic79825620336a148791f1d88e8744a8dff669b2c
2017-04-01 22:10:25 -07:00
Bill Yi
15a6c01404
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I7b31b10f7d84ab10587b50e6a3d1831a3e71886b
2017-04-01 22:03:48 -07:00