Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,162 Commits 3 Branches 0 Tags
6818cd554050152821175eb3d429275e6cc3267d
Commit Graph

24264 Commits

Author SHA1 Message Date
Steve McKay
6818cd5540 Merge "Finish selection mode after copyto and share..." into nyc-dev 
am: 94e3b80d5b

* commit '94e3b80d5b3fd88f6656cb5cae813c4e63faebff':
  Finish selection mode after copyto and share...

Change-Id: If4a47f84569e1cb58eb4d0f3c8e209e78177e615
 2016-05-04 21:37:39 +00:00
TreeHugger Robot
94e3b80d5b Merge "Finish selection mode after copyto and share..." into nyc-dev 2016-05-04 20:58:39 +00:00
Hyunyoung Song
2cbf71a0be Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev 2016-05-04 20:43:09 +00:00
Jason Monk
76ecc4a166 Merge "Fix QS header size after landscape inflation" into nyc-dev 
am: 9ff0083647

* commit '9ff00836473dca5e91bccf109902246458b44adc':
  Fix QS header size after landscape inflation

Change-Id: I97ba6feebc4282e4dcef71e805cf06c9bd2eba55
 2016-05-04 20:22:16 +00:00
Jason Monk
9ff0083647 Merge "Fix QS header size after landscape inflation" into nyc-dev 2016-05-04 20:11:56 +00:00
Jason Monk
cd4e382bd0 Fix QS header size after landscape inflation 
Change-Id: Ic735462d0af2437ed9e74a960ff0dc12126c30f2
Fixes: 28306834
 2016-05-04 16:08:08 -04:00
Philip P. Moltmann
e87fdd9c16 Merge "Add HP and Mopria print recommendation service" into nyc-dev 
am: 9e5d4e078a

* commit '9e5d4e078a93f187f6ec612734dded61372636fb':
  Add HP and Mopria print recommendation service

Change-Id: I6dd1b1dd1787282ad67d7bdd4ffbce070e6de860
 2016-05-04 19:29:18 +00:00
Philip P. Moltmann
9e5d4e078a Merge "Add HP and Mopria print recommendation service" into nyc-dev 2016-05-04 19:22:58 +00:00
Hyunyoung Song
be6c44823b Add Shortcut API to Settings (1/2) 
b/28298258

Initial CL to simply add first time shortcuts in the beginning.

Change-Id: Ib64e3cf1b17979da1548c168cd551ae125289132
 2016-05-04 18:51:30 +00:00
Sid Soundararajan
6c0b20446a Merge "Add a null check for the thumbnail image for transition" into nyc-dev 
am: 2ff157c027

* commit '2ff157c027cb3eb5eddefa39617ec49aeb75a139':
  Add a null check for the thumbnail image for transition

Change-Id: I149beb8615e78677e25b07cbf137152165ae38b9
 2016-05-04 17:30:27 +00:00
Julia Reynolds
25e83b4065 Merge "Uncheck unselected radio buttons." into nyc-dev 
am: 69e0d82994

* commit '69e0d8299460afeea1d33619b341937914a42839':
  Uncheck unselected radio buttons.

Change-Id: Ide0a1270da222aadf343829f54074636e7823fc5
 2016-05-04 17:30:24 +00:00
Sid Soundararajan
2ff157c027 Merge "Add a null check for the thumbnail image for transition" into nyc-dev 2016-05-04 17:14:19 +00:00
TreeHugger Robot
69e0d82994 Merge "Uncheck unselected radio buttons." into nyc-dev 2016-05-04 17:09:52 +00:00
Steve McKay
1d8b98bdd3 Merge "Disable share when dirs selected." into nyc-dev 
am: 3fff306827

* commit '3fff306827c6fe998f8569d71ea18da597eb5a85':
  Disable share when dirs selected.

Change-Id: I2dbe0e2081580b5096a60657b5dc35536dc8f873
 2016-05-04 17:05:28 +00:00
Vladislav Kaznacheev
9d17528e7c Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 
am: e06ef946f4

* commit 'e06ef946f4f86e11f9a8ed5abe216ef7b76aebf0':
  Collect mime type data correctly for all URIs added to ClipData

Change-Id: I6f50e3c880cf7ae6f67f6571cdabe6d68cc1f7c1
 2016-05-04 17:05:25 +00:00
Steve McKay
3fff306827 Merge "Disable share when dirs selected." into nyc-dev 2016-05-04 16:46:30 +00:00
TreeHugger Robot
e06ef946f4 Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 2016-05-04 16:41:08 +00:00
Baligh Uddin
5282bb5ee7 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:13 +00:00
Baligh Uddin
ce7d13e9e6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:45:09 +00:00
Baligh Uddin
2799ff8a4b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-04 13:42:31 +00:00
Felipe Leme
e3f016fb4e Merge "Don\'t display 1st-time dialog when disabling Data Saver." into nyc-dev 
am: b5cc6af44f

* commit 'b5cc6af44ff69200c1693975c76d094bd46adb69':
  Don't display 1st-time dialog when disabling Data Saver.

Change-Id: I22204829f07d4f430d48b243f3db53c454c2d50e
 2016-05-04 13:37:29 +00:00
Julia Reynolds
617a7804bb Uncheck unselected radio buttons. 
Fixes: 28518097
Change-Id: I22cce7837802a97f15af4170f8991db1685ee121
 2016-05-04 09:31:56 -04:00
TreeHugger Robot
b5cc6af44f Merge "Don't display 1st-time dialog when disabling Data Saver." into nyc-dev 2016-05-04 13:24:13 +00:00
Ricky Wai
5a76ee9cd5 Merge "Make notification reply can response to work challenge" into nyc-dev 
am: 92d0e9a4ed

* commit '92d0e9a4ede2c1b8132d9d980d1e51b2e5558ffb':
  Make notification reply can response to work challenge

Change-Id: Ie684a58e8598bcaf9763d282f7624ce81817d6d8
 2016-05-04 10:41:38 +00:00
Tony Mak
012d7426c2 New settings key and policy transparency for managed profile settings 
am: c820cc5fb1

* commit 'c820cc5fb1eb036e76d60a25f151cbd91485feb3':
  New settings key and policy transparency for managed profile settings

Change-Id: Idac0d1357d77c4d740f3978f36e1e56224f66f0b
 2016-05-04 10:41:15 +00:00
Ricky Wai
92d0e9a4ed Merge "Make notification reply can response to work challenge" into nyc-dev 2016-05-04 10:11:21 +00:00
Tony Mak
c820cc5fb1 New settings key and policy transparency for managed profile settings 
Bug: 28281560
Change-Id: I38d0c202088df410a28e78800de4e74377ec3216
 2016-05-04 09:33:08 +00:00
Baligh Uddin
a7558df310 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ic96e78c740e77efbccaee8718e981d6fb9a1da58
 2016-05-04 00:06:46 -07:00
Baligh Uddin
7fd9b8c578 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ia8bad7599bc6c36fd2d28e3e1b223ab64c6981ba
 2016-05-03 23:29:06 -07:00
Baligh Uddin
3a5ffb25d7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: If0b1247f6f525c6db0dddb5fa591d7c46bb2fbf0
 2016-05-03 23:15:27 -07:00
Steve McKay
080efafe1f Finish selection mode after copyto and share... 
actions are picked by user.
Bug: 27601508

Change-Id: I32cbc8e8eb4abba4161309327d5ce730610193ad
 2016-05-03 17:48:22 -07:00
Philip P. Moltmann
bfaa472332 Add HP and Mopria print recommendation service 
- Make util.MDnsUtils local to the mdnsFilter plugins
- Remove HP from the vendors recommended via the mdnsFilter plugin
- Copy in HP's code for HP and Mopria plugin
  - Do not change any code, beside
    - change "_ipp.tcp" to "_ipp._tcp"
    - Change package name
    - Do not use support lib annotations
    - Reduce class visibility if possible
    - Add AOSP copyright
    - Make ServiceResolveQueue a proper sigleton
    - Merge donottranslate and strings
- Add HP and Mopria plugin to RecommendationServiceImpl
- I needed to implement a multiplexer for NsdManager.DiscoveryListener
  as we can only have 10 of them active at a time.

Change-Id: I61caa3f4822f9c013140721ed801d18e6839df55
 2016-05-03 17:10:14 -07:00
Baligh Uddin
582b69a716 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-03 23:49:17 +00:00
Baligh Uddin
8a44c3c8d0 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Ie10dd0e18292f94995761a098df8c42ee69a0e25
 2016-05-03 16:36:29 -07:00
Baligh Uddin
da521ddc53 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I15a9ed4cab9b212c20a05b7fddcb00d74c3172bc
 2016-05-03 16:30:12 -07:00
Felipe Leme
ac0dbbbb8a Don't display 1st-time dialog when disabling Data Saver. 
BUG: 28098106
Change-Id: Iec6deb45a881fab2896463a59cbc7a96a9e5c811
 2016-05-03 15:58:35 -07:00
Steve McKay
9efd34e00c Disable share when dirs selected. 
Pass a SelectionDetails object instead of a pile of booleans into updateActionMenu.
Normalized "is feature X enabled" naming.
Normalized menu fiddling in FilesTuner.

Bug: 28467604
Change-Id: Ic88fab78adf02f794ef0c0550443a3c075e7bab6
 2016-05-03 15:57:27 -07:00
Vladislav Kaznacheev
067d6fadd9 Collect mime type data correctly for all URIs added to ClipData 
Bug: 28452937
Change-Id: I883ae2d22e09000137fa484ef66d5070855cd0ed
 2016-05-03 15:53:45 -07:00
Sid Soundararajan
841fa8ad94 Add a null check for the thumbnail image for transition 
This is needed since apps will send a null thumbnail for when
some content they do not want screenshotted is playing.

BUG: 28343440
Change-Id: Ie1edc78bf16c8ea014a982a115faf9395c9ccab3
 2016-05-03 15:17:47 -07:00
Winson
4f60ba2480 Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev 
am: bd1708a19d

* commit 'bd1708a19da3ae205c4da3f22d0682c9bd1f76fe':
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.

Change-Id: Ifa1b2865dfc7035152864f1b63c4c83946fc5e89
 2016-05-03 22:01:26 +00:00
Winson Chung
bd1708a19d Merge changes If7b8ed3f,I309c3825,Iafd06419,I59f73caf into nyc-dev 
* changes:
  Fixes several animation issues related to a dismissing task.
  Pipe the dismiss button logic through the touch handler.
  Skip scroll-to animation when undocking and there are no tasks.
  Fixing issue with docking being disallowed for secondary user.
 2016-05-03 21:57:03 +00:00
Chris Wren
126d28b51c Merge "copy auto-group decisions to updates" into nyc-dev 
am: facdf19313

* commit 'facdf193139ab32582cf642a6648261bd873268a':
  copy auto-group decisions to updates

Change-Id: I69a8305427176e7f5a998a7bde7b19dc6adfc00e
 2016-05-03 20:12:45 +00:00
TreeHugger Robot
facdf19313 Merge "copy auto-group decisions to updates" into nyc-dev 2016-05-03 20:08:03 +00:00
Todd Kennedy
39c78d2b8d Merge "Don\'t pre-opt shims" into nyc-dev 
am: 5add5bb77f

* commit '5add5bb77f4af3706d878651e2c1e2c45d463c86':
  Don't pre-opt shims

Change-Id: Ia47c9cf03f15f317ecef1561428a9d693913865b
 2016-05-03 19:43:05 +00:00
Todd Kennedy
5add5bb77f Merge "Don't pre-opt shims" into nyc-dev 2016-05-03 19:35:54 +00:00
Julia Reynolds
bc84c0fa67 Merge "Announce access point changes." into nyc-dev 
am: 6af7c23168

* commit '6af7c2316869d15989a2936fa399ec825979a221':
  Announce access point changes.

Change-Id: Ib8b2b6e2ef89650b85de7f401dd955df943bfd34
 2016-05-03 19:07:25 +00:00
Julia Reynolds
6af7c23168 Merge "Announce access point changes." into nyc-dev 2016-05-03 18:58:13 +00:00
Julia Reynolds
7ed62eb7a2 Announce access point changes. 
Bug: 24202851
Change-Id: I0de0d9bf89191750694a7ba2fac4a95babe62aeb
 2016-05-03 14:54:47 -04:00
Christopher Tate
46132b4096 Merge "Always log web link filter verification parameters" into nyc-dev 
am: 44b28493ca

* commit '44b28493cad3fcc2708c58a8bd1a40d6dd1e64eb':
  Always log web link filter verification parameters

Change-Id: I93266be022d8ac86d8f86005dedbb8b09de2d8a4
 2016-05-03 18:32:02 +00:00
Chris Tate
44b28493ca Merge "Always log web link filter verification parameters" into nyc-dev 2016-05-03 18:27:36 +00:00