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

230511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
084c16b8b3 Fixed a clipping bug when expanding children notification 
When children are expanded with a finger we still need to clip!

Change-Id: Ie66bb0ba690163bcabdc503a03f1e23869ec175d
 2016-01-23 01:52:36 +00:00
Filip Gruszczynski
eb12d19417 Merge "Relaunch activity resumed if it got resumed before relaunching." 2016-01-23 01:15:05 +00:00
Filip Gruszczynski
51dc8be223 Relaunch activity resumed if it got resumed before relaunching. 
This fixes following scenario:
1) first activity starts second activity and expects results; first
activity gets paused;
2) second activity finishes and returns a result;
3) first activity is still paused and receives the result from the second
activity; first activty requests a local relaunch; relaunch gets
scheduled and is marked as launching paused (because the activity is
still paused)
4) first activity resumes;
5) first activity relaunches and finishes in paused state.

The fix makes it drop the information about launching paused when it
gets resumed in step 4.

Bug: 25674611
Change-Id: Ieeef3f0d5c311679882fdc59c13fd8a99e3d3a20
 2016-01-22 17:12:49 -08:00
Deepanshu Gupta
676ae8c8c9 Merge "Remove GregorianCalendar hack" am: 187c022bf1 
am: 08f736e7b1

* commit '08f736e7b143f825fe3c29e70e9b505bbf8e1ae6':
  Remove GregorianCalendar hack
 2016-01-23 01:05:26 +00:00
Steve McKay
ee8ba01401 Merge "Fix broken SearchViewUiTest." 2016-01-23 00:54:40 +00:00
Vladislav Kaznacheev
c8680438c0 Merge "Change mouse pointer when drag and drop is active" 2016-01-23 00:26:01 +00:00
Steve McKay
d0086a4960 Fix broken SearchViewUiTest. 
Change-Id: I0df509ff6307f9aeb32d9fbfaaf68de59507e3f7
 2016-01-22 16:23:32 -08:00
Deepanshu Gupta
08f736e7b1 Merge "Remove GregorianCalendar hack" 
am: 187c022bf1

* commit '187c022bf187f137d48d9031c43cfc233c9fc158':
  Remove GregorianCalendar hack
 2016-01-23 00:02:05 +00:00
Deepanshu Gupta
187c022bf1 Merge "Remove GregorianCalendar hack" 2016-01-22 23:53:07 +00:00
Steve McKay
8d4d5c1c20 Merge "Change "touch" to "tap"." 2016-01-22 23:46:17 +00:00
Steve McKay
9814a1a62e Change "touch" to "tap". 
Bug: 26744850
Change-Id: I2f0f0c817ea40de4fbc6ef21e68ccbde293d3135
 2016-01-22 15:44:49 -08:00
Aga Wronska
31f97bc4ee Merge "Add support for renaming documents" 2016-01-22 23:26:35 +00:00
Chris Tate
6e3f354583 Merge "Expanded wallpaper APIs for keyguard and change detection" 2016-01-22 23:24:54 +00:00
Selim Gurun
c20ba757cb Merge "Provide a way to supply different algorithms for token binding key" 2016-01-22 22:52:51 +00:00
Selim Gurun
57a8d2ae31 Provide a way to supply different algorithms for token binding key 
Bug: 22665752

The user of the API can provide different algorithms for key generation.
The API should also provide information about which algorithm is
used for generating the key.

Change-Id: I1d671ba351ca495b031b159132f33291a4f33aac
 2016-01-22 14:50:42 -08:00
Roozbeh Pournader
edef50b6d4 Merge "Move localeScriptWasProvided to end of ResTable_config" 2016-01-22 22:48:42 +00:00
Michal Karpinski
727aa9c296 Merge "Logging of unlock attempts and device locking to security log" 2016-01-22 22:48:17 +00:00
Roozbeh Pournader
7cdb3e3e2d Move localeScriptWasProvided to end of ResTable_config 
This is to try and be safer with different versions potentially
interpreting the data differently.

Change-Id: I599b6a20d908e8379727a5b06cc6631f1954bcff
 2016-01-22 14:47:09 -08:00
Suprabh Shukla
731bf243ee Merge "Minor fixes" 2016-01-22 22:43:38 +00:00
Thierry Strudel
38622c3055 Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793 am: e8b476e8e8 
am: afbf1570ac

* commit 'afbf1570acfac5dfc28196c3f4b424fdaef85508':
  Don't assume kernel tick is 100Hz
 2016-01-22 22:35:05 +00:00
Chris Wren
ab98ee87b8 Merge "implement onNotificationEnqueued callback" 2016-01-22 22:32:55 +00:00
Thierry Strudel
afbf1570ac Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793 
am: e8b476e8e8

* commit 'e8b476e8e81ee8bc4fe70fbc78db2f496b2aa023':
  Don't assume kernel tick is 100Hz
 2016-01-22 22:28:41 +00:00
Thierry Strudel
e8b476e8e8 Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev 
am: 0064c4c793

* commit '0064c4c79341bcb47bcb5b9ff568871f34f1dc63':
  Don't assume kernel tick is 100Hz
 2016-01-22 22:20:30 +00:00
Adam Lesinski
ac7c606c90 Merge "AAPT2: Allow specifying non-final IDS when building 'legacy' style libraries" 2016-01-22 22:12:01 +00:00
Adam Lesinski
ef9c50120d AAPT2: Allow specifying non-final IDS when building 'legacy' style libraries 
Real libraries will be built correctly, but since we are not doing that
yet, support the old way and allow a flag --non-final-ids to remove
the final modifier from R.java.

Change-Id: Iad55fb9140e55dbb0f41d0d55f2e2bd958294c8e
 2016-01-22 14:09:53 -08:00
Thierry Strudel
0064c4c793 Merge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev 2016-01-22 22:07:32 +00:00
Amith Yamasani
9b4716b531 Check apps idle states on time changes am: c465e71cdc am: d4bd4cb4b1 
am: 375901244c

* commit '375901244c051d85a63d7ca83807e5f1ca7a5d0a':
  Check apps idle states on time changes
 2016-01-22 21:49:37 +00:00
Aga Wronska
3b327ef9f9 Add support for renaming documents 
- Add rename dialog
- Add rename menu option
- Enable rename menu option only when renaming supported
- Rename files and directories
- Present error message if renaming fails

Bug: 20493815
Change-Id: Ic7386d14e3876655fb19245b9a90b4c67a4febb4
 2016-01-22 13:36:40 -08:00
Ben Gruver
1ed9046617 Merge "Specify the time units for waitForActivityWithTimeout" 2016-01-22 21:27:44 +00:00
Ben Gruver
87904e83f9 Specify the time units for waitForActivityWithTimeout 
Change-Id: I21bf943e03d1f85094af5e7579fefb27f302f16c
 2016-01-22 13:11:11 -08:00
Amith Yamasani
375901244c Check apps idle states on time changes am: c465e71cdc 
am: d4bd4cb4b1

* commit 'd4bd4cb4b1faa8663cc8dde4d9bab15a9ec764d3':
  Check apps idle states on time changes
 2016-01-22 20:58:46 +00:00
Ruben Brunk
cda00b15d2 Merge "Log important VrManagerService lifecycle events." 2016-01-22 20:55:10 +00:00
Amith Yamasani
d4bd4cb4b1 Check apps idle states on time changes 
am: c465e71cdc

* commit 'c465e71cdc401e1565c29a895a5c6d366ba5344c':
  Check apps idle states on time changes
 2016-01-22 20:51:34 +00:00
Ruben Brunk
87112f73f0 Log important VrManagerService lifecycle events. 
- Events are rare, and user triggered, so will not
  cause logcat spamming.

Change-Id: I2bdf29b0ca7d86ab64e9a20ee018e3f9e8eb1e5d
 2016-01-22 12:48:26 -08:00
Christopher Tate
ad3c2592a0 Expanded wallpaper APIs for keyguard and change detection 
* There is a nonzero integer ID associated with the currently-set
  wallpaper image, and this changes every time any caller sets
  the wallpaper.  This is to support external change detection.

* The API now permits a caller to independently set imagery as
  the new general system wallpaper or keyguard-specific wallpaper.
  The backing implementation is not yet plumbed through, but the
  API is now in place for clients to safely write code against.

Bug 25454501
Bug 25454162

Change-Id: I4934f102d5630485bf2870d83664145ae68a3695
 2016-01-22 12:45:42 -08:00
Ben Kwa
3900e4c9a0 Merge "Show empty file cabinet for no search results." 2016-01-22 20:44:40 +00:00
Michael Wright
1262dc0390 Merge "Switch and store keyboard layouts based on IME subtype." 2016-01-22 20:18:29 +00:00
Chris Wren
4763342533 implement onNotificationEnqueued callback 
Bug: 22455414
Change-Id: I9dafc7b8cbf0268b28d9e9fb0cae9c3b451be52c
 2016-01-22 15:10:37 -05:00
Vladislav Kaznacheev
ba761124e6 Change mouse pointer when drag and drop is active 
Mouse pointer is set to STYLE_GRAB when the drag has started and
reset to STYLE_DEFAULT when the drag has ended.

Resetting the pointer shape to the one defined by an underlying
view will be handled in a separate patch.

Bug: 24415739
Change-Id: I8df0a08c5701a34a48f10ec6b43c2cf2e6362d61
 2016-01-22 12:09:45 -08:00
Filip Gruszczynski
fea5aa3bf3 Merge "Fix minor logging issues in WindowSurfacePlacer." 2016-01-22 20:05:08 +00:00
Tor Norbye
df8373389d Merge "Specify a maximum value for View.MeasureSpec.makeMeasureSpec" 2016-01-22 20:00:16 +00:00
Steve McKay
9ed88a4da7 Show empty file cabinet for no search results. 
And for empty directory.

Magic-submit? Yes please!

Change-Id: If9e1f8ab48eebd9c275ad043da728e28b850ab73
 2016-01-22 11:59:16 -08:00
Julia Reynolds
5971d553b5 Merge "Inline settings color changes." 2016-01-22 19:47:37 +00:00
Felipe Leme
beda539051 Merge "Updates notification while bugreport zip is being changed." 2016-01-22 19:46:38 +00:00
Filip Gruszczynski
501e55a055 Merge "Fix thumbnail header animation to follow the app window." 2016-01-22 19:43:54 +00:00
Alan Viverette
7dfd9e4cd6 Merge "Verify results of methods called during child ordering" 2016-01-22 19:43:18 +00:00
Julia Reynolds
7727ad23b2 Inline settings color changes. 
Bug: 26486314
Change-Id: I8c842081e544b05c6d88e99361426052c216d8f7
 2016-01-22 14:38:46 -05:00
Felipe Leme
30a70d1cbb Merge "Initial implementation of onShellCommand()." 2016-01-22 19:37:53 +00:00
Makoto Onuki
4e91b3432f Merge "Disable log" 2016-01-22 19:37:09 +00:00
Deepanshu Gupta
4f3d0c6caa Remove GregorianCalendar hack 
Bug: http://b.android.com/199424
Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996
 2016-01-22 11:33:53 -08:00