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

22475 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
d6689d99f7 Merge "Ensure directory names are aligned correctly..." into nyc-dev 2016-03-01 22:30:15 +00:00
Steve McKay
d511a090d2 Merge "Don't assert against Recents title." into nyc-dev 2016-03-01 21:39:27 +00:00
Steve McKay
355d82b67e Don't assert against Recents title. 
It was causing a failure.

Bug: 27383076
Change-Id: Ieb4693783831443e05f32333c181371b0eb4fb93
 2016-03-01 13:36:22 -08:00
Michael Wright
a75c2a7819 Merge "Show error message when pairing fails in SUW." into nyc-dev 2016-03-01 21:32:06 +00:00
Dianne Hackborn
a6dcaa6f84 Merge "Fix issue #27317952: PendingIntent.getIntent() should be protected" into nyc-dev 2016-03-01 20:57:02 +00:00
Jason Monk
bbcdab6f01 Merge "Fix difference in icon size for quick QS" into nyc-dev 2016-03-01 20:10:24 +00:00
Jason Monk
ec87a878d3 Fix difference in icon size for quick QS 
Bug: 27371482
Change-Id: I7c1316bf3b3ff6dfde0a92a6c8b9599c2f203503
 2016-03-01 15:00:16 -05:00
Winson
9da1885047 Fixing regression in creating dismiss descriptions. 
Bug: 27411256
Change-Id: I39f56257544d593838349049208fe59f551100eb
 2016-03-01 19:58:06 +00:00
Winson Chung
6b03ff8d57 Merge "Skip animation in error case, log for further investigation." into nyc-dev 2016-03-01 19:57:05 +00:00
Steve McKay
8b8a6fd193 Ensure directory names are aligned correctly... 
In list view...and don't show dir dates, even when present.
In fact, no details on folders at all when in list view.
Also improve layout of files without details (if they exist).

Bug: 27406730
Change-Id: Ida4b5f99666c4a145ca98a3c15c480e59a76b4a6
 2016-03-01 11:49:21 -08:00
Jason Monk
e636afd901 Merge "Handle density changes in QS" into nyc-dev 2016-03-01 19:26:56 +00:00
Selim Cinek
a26ddbaf7b Notification groups with only one child behave nicer when swiping 
When swiping the last child of a group away the notification parent
is now swiped instead of the child, unless it is non-dismissable.

Bug: 27420342
Change-Id: Idbb1fac5e46a5a91af829973ee167ad400be82a5
 2016-03-01 19:16:33 +00:00
Selim Cinek
8e0c498165 Fixed a bug where children were not / incorrectly userlocked 
This can lead to all sorts of weird behavior

Bug: 24866646
Change-Id: If3395c5f1b524592cd658a57ac91d2a0fe893011
 2016-03-01 19:16:11 +00:00
Selim Cinek
898d173b92 Expanding first child in a group now if it's the only one 
When expanding notifications, the first child is now expanded
if it's the only one in there.

Bug: 27419554
Change-Id: Icdadbb7036e4cd5964de4c2e96e6a8322052bc93
 2016-03-01 19:15:30 +00:00
Jason Monk
ee70388723 Merge "Fix QS edit BGs" into nyc-dev 2016-03-01 19:14:33 +00:00
Felipe Leme
c50bf8e33e Merge "Created metric events for scoped directory access API." into nyc-dev 2016-03-01 18:58:28 +00:00
Julia Reynolds
1c7cd0a882 Merge "Fix app icon in notification guts." into nyc-dev 2016-03-01 18:54:53 +00:00
Felipe Leme
3e166b27fc Created metric events for scoped directory access API. 
BUG: 27334821
Change-Id: I8a1bfc328dcd26b42bb66884d14b34ad11aa232f
 2016-03-01 10:12:58 -08:00
Winson
3f3d744d5c Skip animation in error case, log for further investigation. 
Bug: 27389156
Change-Id: Idc2ebdf04ab72d326f68a47627b27d6e61315d1e
 2016-03-01 10:07:04 -08:00
Yorke Lee
810252ad47 Merge "Add setAlwaysOpaque and setTint to BarTransitions" into nyc-dev 2016-03-01 17:50:33 +00:00
Julia Reynolds
be0184662d Fix app icon in notification guts. 
Bug: 27408961
Change-Id: Iafae86dff611eb5c00b283452b5fcbc65f314c9e
 2016-03-01 12:23:21 -05:00
Jason Monk
46dbfb475f Handle density changes in QS 
Bug: 26845796
Change-Id: Icc783c9d706382e553df49f699aaf44aac943d18
 2016-03-01 11:08:19 -05:00
Julia Reynolds
2319dd3a66 Merge "Api review: AutomaticZenRule" into nyc-dev 2016-03-01 15:05:36 +00:00
Jason Monk
1aec93f181 Fix QS icon animations once and for all 
Bug: 27250295
Change-Id: I6449b9cea19acf120dfc02d146fe608da46fe790
 2016-03-01 09:42:34 -05:00
Tomasz Mikolajewski
1f67c8740c Merge "Fix crash in isChildDocument when parent is in zip, and child not." into nyc-dev 2016-03-01 10:25:30 +00:00
Tomasz Mikolajewski
e192cb71d6 Fix crash in isChildDocument when parent is in zip, and child not. 
There is no regular file representation for archive documents, so
the call to getFileForDocId(archivedDocId) was throwing an exception.

Bug: 27383423
Change-Id: Icbc1e8ecdddc7698cfdb79b41da6e1d3cecf11ae
 2016-03-01 10:23:59 +00:00
Daichi Hirono
e5b499bcc5 Merge "Fix RootScanner to execute scan at least once before cancelling it." into nyc-dev 2016-03-01 07:50:18 +00:00
Daichi Hirono
2e9a57b0d4 Fix RootScanner to execute scan at least once before cancelling it. 
Previously RootScanner is implemented by FutureTask, and if it is
cancelled before it starts running in background thread, the scan will
be never executed.

The CL stops using FutureTask and introduces CountDownLatch to control
UpdateRootsRunnable.

BUG=27369585

Change-Id: Ica8799faba0a8e5ca91a6b8be36dc4f5118d6333
 2016-03-01 13:51:06 +09:00
Yorke Lee
1b268cbca6 Add setAlwaysOpaque and setTint to BarTransitions 
Allow the opacity and color of the NavigationBarView
to be controlled.

Bug: 26425669

Change-Id: I364f183bf0ef90c446ae68987ccc3b6bbf09aa67
 2016-02-29 19:14:04 -08:00