Android/frameworks_base

Files

History

Jason Monk 769139da03 resolve merge conflicts of daeafccfa9 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39

2017-05-29 11:10:28 +02:00

..

colorextraction

Merge "Color extraction under Power and Volume menus"

2017-05-24 15:53:40 +00:00

…

Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev am: 70739fb812

2017-05-26 15:13:59 +00:00

Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev am: 03a243889c

2017-05-26 14:53:48 +00:00

Merge "Keyguard: Update clock size" into oc-dev am: 6441e1064c

2017-05-24 21:15:16 +00:00

…

src/com/android

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

Android.mk

Merge changes from topic 'background_inflation' into oc-dev am: 03fbdbe6ff

2017-05-08 22:30:48 +00:00

AndroidManifest.xml

Merge "Filter package related info" into oc-dev am: 72b7b1f001

2017-05-18 19:51:53 +00:00

lint.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…

README.md

…

README.md

SystemUI Documentation

Demo Mode