Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
218,360 Commits 3 Branches 0 Tags
ecfbd3edcf07da7b221129a8dfe342cdafbd52eb
Commit Graph

218360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve McKay
ecfbd3edcf Merge "Move State to a separate file." 2015-09-25 04:59:31 +00:00
Adrian Roos
6f4cfbc3e5 am f73aab33: (-s ours) am 2ce4fb0c: am a4150f49: am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'f73aab339ebfb9a05151bdf1dd632abe37becda4':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-25 00:14:55 +00:00
Adrian Roos
f73aab339e am 2ce4fb0c: am a4150f49: am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '2ce4fb0c1f4824981f6ed03135bf513d98fb3153':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-25 00:08:22 +00:00
Adrian Roos
2ce4fb0c1f am a4150f49: am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'a4150f49d031d431a7bdcc1cdedbffc4d3e312a5':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:59:45 +00:00
Adrian Roos
a4150f49d0 am f02ba4b8: am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'f02ba4b8ffc44ccbb94ebcf1b70b77fc06af83d4':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:50:09 +00:00
Adrian Roos
f02ba4b8ff am 09945c0b: am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '09945c0bdef5acf8276d433a96de3a5589b2de86':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:40:43 +00:00
Adrian Roos
09945c0bde am fe7ceca1: (-s ours) am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'fe7ceca1acdbcde6449f57bb19b45f8c948cc1f5':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:32:01 +00:00
Adrian Roos
fe7ceca1ac am 9ceec2f0: am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '9ceec2f0f007e05ed2842f222b4f652bdd69eb3f':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:25:48 +00:00
Steve McKay
2fbe728069 Merge "Show empty roots except for content pickers." 2015-09-24 23:18:26 +00:00
Steve McKay
0200e34637 Show empty roots except for content pickers. 
Bug: 24140864

Change-Id: I9fae80a1e3d413e97ee099bee9c59f81f713cf27
 2015-09-24 16:16:43 -07:00
Ben Kwa
32a5776039 Merge "Fix a crash when deleting documents." 2015-09-24 23:13:42 +00:00
Adrian Roos
9ceec2f0f0 am f6c75158: am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'f6c7515817f9a4c24d2ff9baba2f916795862098':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 23:11:55 +00:00
Wale Ogunwale
e25a8292f8 Merge "Added am command to suppress config. changes during task resize." 2015-09-24 23:08:02 +00:00
Chong Zhang
04246b87b5 Merge "Use visible frame instead of task bounds for detecting resize start" 2015-09-24 23:03:12 +00:00
Ben Kwa
8923911c69 Fix a crash when deleting documents. 
Deleting (and moving) documents invalidates previous selections, as
items change position.  Exit selection mode *before* actually deleting
anything, otherwise we end up trying to unselect potentially deleted
documents.

BUG=24338150

Change-Id: I79fb0c156142b78987be68560c78306f2678c521
 2015-09-24 16:01:13 -07:00
Adrian Roos
f6c7515817 am 12c54dfa: am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit '12c54dfa1219c5bb81482fe4bd4b164637f2e8b2':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 22:59:37 +00:00
Winson Chung
885291318b Merge "Removing unused debug overlay code." 2015-09-24 22:58:39 +00:00
Winson
dab26488b4 Removing unused debug overlay code. 
Change-Id: I80d98b38001ca37bf5017b1631038fb574c324af
 2015-09-24 15:56:10 -07:00
Wale Ogunwale
83301a933f Added am command to suppress config. changes during task resize. 
This command is useful for testing during development, but at some
point we will decide if allowing configuration changes during resizing
is okay or merge in http://ag/759766 to suppress configuration changes
during resizing and deliver the new config. to the app.

This functionality will be reverted once we decide.

Bug: 24380097
Change-Id: I223c08bc939e564a78e70994b599770be9d4730d
 2015-09-24 15:54:08 -07:00
Adrian Roos
12c54dfa12 am c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev 
* commit 'c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
  DO NOT MERGE Send next alarm's show intent via PendingIntent
 2015-09-24 22:49:19 +00:00
Adrian Roos
c9f7abe370 Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev 2015-09-24 22:39:23 +00:00
Ben Kwa
437c507085 Merge "DocumentsUI: Add an error screen to DirectoryFragment." 2015-09-24 22:28:08 +00:00
Chong Zhang
9184ec6860 Use visible frame instead of task bounds for detecting resize start 
Initial task bounds might be adjusted (for status bar, etc.). Touch
should be set up using visible frames instead of task bounds.

bug: 24336351
Change-Id: I944e3185a06c39b451432bdda5ad87880a0482f3
 2015-09-24 22:27:08 +00:00
Zach Kuznia
d7d72cf73a Merge "Use the standard GestureDetector for Double Taps in TouchExplorer" 2015-09-24 22:14:09 +00:00
Ben Kwa
91bec536ac DocumentsUI: Add an error screen to DirectoryFragment. 
- Reorganize the directory fragment.
- Repurpose the "empty" view to hold a message and a button.
- Message is set to the "No items" message if a directory is empty.
- Message is set to the error message if a query error occurs.
- Don't close DocumentsUI when a query error occurs.

Change-Id: I4e1e96f23040606b410ac746252dcb0ab9286f04
 2015-09-24 15:06:14 -07:00
Todd Kennedy
0b29ba687e am 8f08db9d: am 4e321745: resolved conflicts for cafacef6 to stage-aosp-master 
* commit '8f08db9def9b40075534facd20add5835cd3b5be':
  Frameworks/base: Propagate boot status to installd
 2015-09-24 21:56:34 +00:00
Todd Kennedy
8f08db9def am 4e321745: resolved conflicts for cafacef6 to stage-aosp-master 
* commit '4e321745173de1eb89343238fadfbcc7ba1a88f9':
  Frameworks/base: Propagate boot status to installd
 2015-09-24 21:48:50 +00:00
Zachary Kuznia
c052c635ee Use the standard GestureDetector for Double Taps in TouchExplorer 
b/24339804

Change-Id: I96fa1287fa941178fb9970ceb34d95a3604e6815
 2015-09-24 14:47:07 -07:00
Todd Kennedy
4e32174517 resolved conflicts for cafacef6 to stage-aosp-master 
Change-Id: Id02e098a02aede327c5bc1a98aa177d8bf9ec5a9
 2015-09-24 14:34:06 -07:00
Alan Viverette
5954383b1f Various fixes for Material widget styles 
- Body1 text appearance in Material-styled NumberPicker
- Non-inverse text color in colored bordered button disabled state

Bug: 24374092
Bug: 24267929
Change-Id: I576af6171fc64ab821b6455d3b825c9b05eec4a7
 2015-09-24 17:07:14 -04:00
Oren Blasberg
8f3976c875 Merge "Cascading submenus: Fix a few small issues." 2015-09-24 20:59:44 +00:00
Oren Blasberg
734320d06b Cascading submenus: Fix a few small issues. 
1. Open submenus now disappear instantly rather than fading out when
mouse hovers over a non-submenu item.

2. When a submenu is opened on hover, the item that was hovered now
will remain selected instead of being deselected.

3. Fix an issue where if the same chain of submenus was opened more
than once, the submenus could open in a different direction each
time. To fix, we keep track of the direction of opening along the way
and make sure to reset the preferred direction when a submenu is
closed.

Bug: 20127825
Change-Id: I99972cce4ddabe316c5148f1dd79a5d7b3e64b87
 2015-09-24 13:36:15 -07:00
Todd Kennedy
cafacef60e Merge "Frameworks/base: Propagate boot status to installd" 2015-09-24 20:35:09 +00:00
Andreas Gampe
55fe944f98 Frameworks/base: Propagate boot status to installd 
Propagate the boot status explicitly to installd so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
(cherry picked from commit 06bb908b78)
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
 2015-09-24 12:27:25 -07:00
Sean Young
d75247cf7f am da2f549f: am 2d39bfd5: Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev 
* commit 'da2f549f3b77ee5f04a6f726facb1a091d796054':
  Properly expose methods that override a non-hidden method in a hidden superclass in the API files.
 2015-09-24 19:10:26 +00:00
Sean Young
da2f549f3b am 2d39bfd5: Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev 
* commit '2d39bfd51fabee0396fa3107ff98065ef4832667':
  Properly expose methods that override a non-hidden method in a hidden superclass in the API files.
 2015-09-24 19:01:33 +00:00
Sean Young
2d39bfd51f Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev 2015-09-24 18:55:50 +00:00
Jorim Jaggi
7a2421ddbb am 35f215cf: am 2d48a93f: am 98a8c7c5: am e1de9f67: Fix black Keyguard 
* commit '35f215cfafcaff6f4a8283c0215431485f7382e5':
  Fix black Keyguard
 2015-09-24 18:34:17 +00:00
Jeff Hao
97bb1ad7c3 Merge "resolved conflicts for f005d55f to master" 2015-09-24 18:29:39 +00:00
Makoto Onuki
5932fbb923 Merge "Test more DPM APIs." 2015-09-24 18:28:45 +00:00
Jeff Hao
b18d084f4b resolved conflicts for f005d55f to master 
Change-Id: I82027116a2b0bfc8b1ff1e20c3a115a1ba8a19db
 2015-09-24 11:26:48 -07:00
Jorim Jaggi
35f215cfaf am 2d48a93f: am 98a8c7c5: am e1de9f67: Fix black Keyguard 
* commit '2d48a93fea89cbdaae8e6cb718dbc382e35764df':
  Fix black Keyguard
 2015-09-24 18:20:57 +00:00
Jorim Jaggi
2d48a93fea am 98a8c7c5: am e1de9f67: Fix black Keyguard 
* commit '98a8c7c553108e6d6f6260ae5c1f05d8a6c8af10':
  Fix black Keyguard
 2015-09-24 18:14:42 +00:00
Jorim Jaggi
98a8c7c553 am e1de9f67: Fix black Keyguard 
* commit 'e1de9f674575df3b17e475c4f32dd93d33e596e3':
  Fix black Keyguard
 2015-09-24 18:08:07 +00:00
Jeff Hao
f005d55fb7 am 75ab8c77: am 384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU." 
* commit '75ab8c7789b4ec5e26bc7d2f773a6c39d39a821b':
  Shorten first boot time by filtering dexopted apps by LRU.
 2015-09-24 17:47:56 +00:00
Jorim Jaggi
e1de9f6745 Fix black Keyguard 
When a window has both the flag fullscreen and the dismiss Keyguard
flag, we end up in a state where we hide the status bar window but
all other windows, because mShowingLockscreen nevers gets set
correctly. Move it up so we always set it no matter whether the
status bar window was visible.

Bug: 22875357
Change-Id: I7953fe7100cc99fe8fb7424a9b311b4630426657
 2015-09-24 17:47:14 +00:00
Blazej Magnowski
329d20d5e0 Merge "added Classifiers and Evaluators" 2015-09-24 17:43:02 +00:00
Jeff Hao
75ab8c7789 am 384d84f4: Merge "Shorten first boot time by filtering dexopted apps by LRU." 
* commit '384d84f4f02643b63335f6d8d884adc1186d6896':
  Shorten first boot time by filtering dexopted apps by LRU.
 2015-09-24 17:39:34 +00:00
Jeff Hao
384d84f4f0 Merge "Shorten first boot time by filtering dexopted apps by LRU." 2015-09-24 17:30:25 +00:00
Jeff Hao
b84cb9e971 Shorten first boot time by filtering dexopted apps by LRU. 
No longer dexopt all system apps and boot listener user apps.

Bug: 23628238
Bug: https://code.google.com/p/android/issues/detail?id=186589

Change-Id: Ib4f960686afcfda13838f7783c2d3ccf8e26db72
 2015-09-24 10:24:10 -07:00