drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,739 Commits 1 Branch 0 Tags
Commit Graph

22780 Commits

Author SHA1 Message Date
Jason Monk
15e637dafd Merge "Add edit title to QS edit" into nyc-dev 
am: 4cabb1b91f

* commit '4cabb1b91fb32c8e07ce2649b2090518b6d2c7b9':
  Add edit title to QS edit
 2016-03-02 20:07:20 +00:00
Jason Monk
a2549ca8dd Merge "Guard against monkey crash" into nyc-dev 
am: c04cf4baec

* commit 'c04cf4baecfdfeaf82c8498203779d594c9b52a4':
  Guard against monkey crash
 2016-03-02 20:05:15 +00:00
Jason Monk
4cabb1b91f Merge "Add edit title to QS edit" into nyc-dev 2016-03-02 19:48:25 +00:00
Jason Monk
c04cf4baec Merge "Guard against monkey crash" into nyc-dev 2016-03-02 19:48:01 +00:00
Ben Kwa
fed032e1a8 Merge "Tweak root item layouts." into nyc-dev 
am: f8d6fa2c5a

* commit 'f8d6fa2c5a42b9adaa7a745bc9c9feaeb3800cc3':
  Tweak root item layouts.
 2016-03-02 19:45:05 +00:00
Ben Kwa
f8d6fa2c5a Merge "Tweak root item layouts." into nyc-dev 2016-03-02 19:39:06 +00:00
Jason Monk
ae5bd03831 Guard against monkey crash 
Bug: 27448755
Change-Id: I8345a274c979bf8ca1b4041c14318dd73810f79a
 2016-03-02 14:38:31 -05:00
Jason Monk
f923db5623 Add edit title to QS edit 
Bug: 27439419
Change-Id: I3807dc56a05b1ffafcd9b390dfdbc1da9a7ebcac
 2016-03-02 14:11:14 -05:00
Steve McKay
1788dfd223 Merge "Always show intern storage." into nyc-dev 
am: b4672ef6df

* commit 'b4672ef6dfbaf416981539d515ad1489d7d0bc87':
  Always show intern storage.
 2016-03-02 19:02:19 +00:00
Steve McKay
b4672ef6df Merge "Always show intern storage." into nyc-dev 2016-03-02 18:49:28 +00:00
Steve McKay
7c4395804e Always show intern storage. 
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".

Bug: 27297398

Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
 2016-03-02 10:47:59 -08:00
Jaewan Kim
008d56918b Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev 
am: 19d7eeaedf

* commit '19d7eeaedf4c80ae1d191f201ab028adc88ac2cb':
  PIP: Show recents again when PIP menu is closed
 2016-03-02 18:46:55 +00:00
Chong Zhang
20862420c2 Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev 
am: 5d9de3ab6f

* commit '5d9de3ab6f768c9b9d5c4fa627ce019f74370531':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 18:42:42 +00:00
Dongwon Kang
19d7eeaedf Merge "PIP: Show recents again when PIP menu is closed" into nyc-dev 2016-03-02 18:34:10 +00:00
Chong Zhang
5d9de3ab6f Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev 2016-03-02 18:30:00 +00:00
Chris Wren
8b6e1c888b Merge "add all those great comments from the other file" into nyc-dev 
am: e83cd6147b

* commit 'e83cd6147be45afd57722e414239d2dd15e257c0':
  add all those great comments from the other file
 2016-03-02 18:03:08 +00:00
Jason Monk
49f68ab466 Merge "Fix crash from battery detail" into nyc-dev 
am: 8326e38bf5

* commit '8326e38bf51de2771dab65baee9a97fb6ae7ff1d':
  Fix crash from battery detail
 2016-03-02 17:51:51 +00:00
Chris Wren
e83cd6147b Merge "add all those great comments from the other file" into nyc-dev 2016-03-02 17:51:29 +00:00
Jaewan Kim
3ebc1e3f99 PIP: Show recents again when PIP menu is closed 
Framework enforces that an app cannot go back to Recents.
So launches the Recents again for the PIP menu.

Change-Id: I7526edfe7dd38c7eb1befe6a8b2b5f4ea30aa84e
 2016-03-02 09:51:07 -08:00
Jason Monk
8326e38bf5 Merge "Fix crash from battery detail" into nyc-dev 2016-03-02 17:42:27 +00:00
Jason Monk
6cb901268e Fix crash from battery detail 
Bug: 27417780
Change-Id: Ia63dd78a4b7b75470b57c8262bbc836180274bf5
 2016-03-02 12:40:43 -05:00
Geoff Mendal
a793284540 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 16:38:50 +00:00
Geoff Mendal
48a4eb1f81 Import translations. DO NOT MERGE 
Change-Id: I0b50c9fa731657538936e961e3c0fa1eaa594489
Auto-generated-cl: translation import
 2016-03-02 07:30:42 -08:00
Geoff Mendal
cc3cae5edf Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:26:07 +00:00
Geoff Mendal
6c9af03fce Import translations. DO NOT MERGE 
Change-Id: I5f64277ff355790a3babb97dfeb37ecc892dfa71
Auto-generated-cl: translation import
 2016-03-02 07:25:28 -08:00
Geoff Mendal
840d8f1446 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:22:28 +00:00
Geoff Mendal
1ddc11be55 Import translations. DO NOT MERGE 
Change-Id: Id4836eb0d7454cbb028a40032ecd229e4a4d90d3
Auto-generated-cl: translation import
 2016-03-02 07:20:37 -08:00
Geoff Mendal
a302da37a7 Import translations. DO NOT MERGE 
Change-Id: If6f96f29b8c300b1edc27cf0725dfe3492465e7d
Auto-generated-cl: translation import
 2016-03-02 07:14:03 -08:00
Tomasz Mikolajewski
d191d076b8 Merge "Fix DocumentUI\'s perf tests compile failure." into nyc-dev 
am: 0d26fdb6cd

* commit '0d26fdb6cd3c4637ec2c4db7467c739991285a0b':
  Fix DocumentUI's perf tests compile failure.
 2016-03-02 09:17:10 +00:00
Tomasz Mikolajewski
0d26fdb6cd Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev 2016-03-02 09:00:48 +00:00
Tomasz Mikolajewski
f4628336b2 Fix DocumentUI's perf tests compile failure. 
It compiled locally, but not on the APCT.

Bug: 27370274
Change-Id: I7f10f3bf5b370d8e92311febfdcae133148e1312
 2016-03-02 17:57:46 +09:00
Tomasz Mikolajewski
6b99f43c2c Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev 
am: ed82931cae

* commit 'ed82931cae2c867288d3caf0ec04417ee59f73c5':
  Add a missing include in DocumentsUI Android.mk.
 2016-03-02 08:20:49 +00:00
Tomasz Mikolajewski
ed82931cae Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev 2016-03-02 08:06:04 +00:00
Tomasz Mikolajewski
04049407a8 Add a missing include in DocumentsUI Android.mk. 
Without it, perf tests were not built on APCT.

Bug: 27370274
Change-Id: Ie154526d240bb9d1b4cce6fc089d502bf808c366
 2016-03-02 17:03:47 +09:00
Tomasz Mikolajewski
5882b829e6 Merge "Fix broken tests due to uninitialized roots." into nyc-dev 
am: 621a71c342

* commit '621a71c342ab9c101b51a3b04db62792cfdbdcad':
  Fix broken tests due to uninitialized roots.
 2016-03-02 06:20:36 +00:00
Tomasz Mikolajewski
53622d2950 Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev 
am: 1a06789959

* commit '1a06789959fe66c21adc32319bd51601b414b112':
  Add scaffolds for performance tests of DocumentsUI
 2016-03-02 05:44:17 +00:00
Tomasz Mikolajewski
cf057efaff Fix broken tests due to uninitialized roots. 
Change-Id: I014657cab86ffa17290ab8990f0adaa6f6451e15
 2016-03-02 14:40:43 +09:00
Tomasz Mikolajewski
1a06789959 Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev 2016-03-02 05:35:04 +00:00
Tomasz Mikolajewski
ae6d6b494c Add scaffolds for performance tests of DocumentsUI 
Bug: 27370274
Change-Id: I14dea1b85cd84c8bb3c0eee27b2954108bfa4f8b
 2016-03-02 13:01:11 +09:00
Fyodor Kupolov
80d150f441 Merge "Restored switchTo method" into nyc-dev 
am: 5dbe1f30ef

* commit '5dbe1f30ef1feac24d2c8216e6bcbdbb3340e0cf':
  Restored switchTo method
 2016-03-02 02:49:35 +00:00
Fyodor Kupolov
caab2666bd Restored switchTo method 
It is current used in another branch. Restored to fix a breakage.

Change-Id: Iec98bf525b88b6b5b45bffb97a1f3e9b57c492dd
 2016-03-01 18:39:27 -08:00
Steve McKay
c3cfd763a9 Merge "Fix roots filtering for move operations." into nyc-dev 
am: de5ec832b1

* commit 'de5ec832b10b155d1d61de4eedb5171da3a76a9c':
  Fix roots filtering for move operations.
 2016-03-02 02:31:41 +00:00
Selim Cinek
bf964bb1aa Fixed a bug where the notification texts wouldn\'t animate 
am: 049f6adfb8

* commit '049f6adfb8fea4622af5cd3247514ec7a461bf46':
  Fixed a bug where the notification texts wouldn't animate
 2016-03-02 02:04:00 +00:00
Steve McKay
de5ec832b1 Merge "Fix roots filtering for move operations." into nyc-dev 2016-03-02 01:33:33 +00:00
Steve McKay
ea9ec291ed Fix roots filtering for move operations. 
Add test coverage for the Downloads case.
This was a regression to my recent cleanup of RootInfo.
Fixed logic to not exclude basically *everything* when a
    directory is in the set of files to be copied.

Bug: 27303346
Change-Id: I4d5608e0d8d95448b027b20107a11a7a5e46d45e
 2016-03-02 01:32:30 +00:00
Selim Cinek
049f6adfb8 Fixed a bug where the notification texts wouldn't animate 
If the texts were the same but one had an ellipsis and the
other didn't, things were not animating nicely.

Bug: 27419215
Change-Id: Iaa9611e1cf60b6fe71113b76f36ab5c24e461961
 2016-03-02 01:21:26 +00:00
Fyodor Kupolov
cef5ba5adc Merge "Disable switching users if the user is in a call" into nyc-dev 
am: 285bec2641

* commit '285bec2641292abc37c5ad230bd309cede754a70':
  Disable switching users if the user is in a call
 2016-03-01 23:33:32 +00:00
Fyodor Kupolov
285bec2641 Merge "Disable switching users if the user is in a call" into nyc-dev 2016-03-01 23:21:29 +00:00
Steve McKay
2eb8bc2aca Merge "Ensure directory names are aligned correctly..." into nyc-dev 
am: d6689d99f7

* commit 'd6689d99f71d3fed88b67d410a59b378d2abe791':
  Ensure directory names are aligned correctly...
 2016-03-01 23:11:49 +00:00
Chong Zhang
e4fbd328f8 Don't change resize mode if AM didn't dock the task as requested 
AM may not docked the task as requested if the task is not resizeable.
Setting resizing in this case would cause unnecessary drag-resizing,
and the resize mode will go out of sync.

bug: 27390258
Change-Id: I72d671ac015f93fde5aaa025fbade93acd9d9ca7
 2016-03-01 14:52:58 -08:00