Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,372 Commits 3 Branches 0 Tags
0b744d7aec2e05d1ffd2dd2c63e2ea65d73f286b
Commit Graph

53214 Commits

Author SHA1 Message Date
Benjamin Franz
95b555fc90 am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev 
* commit '8b5c2e8acd01c87204ba0b842a35c625be174e5b':
  Align the behaviour of different lock task modes
 2015-06-11 16:38:36 +00:00
Benjamin Franz
d168d184c0 Merge "Align the behaviour of different lock task modes" into mnc-dev 2015-06-11 16:15:37 +00:00
John Spurlock
2fd86477b1 am a03c1050: am c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 
* commit 'a03c1050e46a4bab2f1e532d295ab269e98471ac':
  Volume: Disable seekbar prefs when zen muted.
 2015-06-11 14:23:44 +00:00
John Spurlock
c110887c2a Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev 2015-06-11 14:08:48 +00:00
Svet Ganov
72c9e50908 am f3dbed08: am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit 'f3dbed08df13859dee3c4b000646542c9d867615':
  Propagete document meta-data to custom print UI.
 2015-06-11 12:54:05 +00:00
Svet Ganov
392b8e0154 am 4794e300: am e545bd36: Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 
* commit '4794e3001f6a53515178d5f8069d2e0e09a87285':
  Permission group is granted if one permission is granted for UI purposes.
 2015-06-11 12:54:00 +00:00
Chris Banes
d4e6479ef7 am 0d4798be: am dbdaa9b4: Merge "API council review feedback for ActionMenuView" into mnc-dev 
* commit '0d4798beb9891d806c29ef8c259790bd7e9c10b6':
  API council review feedback for ActionMenuView
 2015-06-11 12:53:48 +00:00
Svetoslav
47db722168 am 0525c07f: am 75a0ee08: Merge "Add system API to watch for permission changes" into mnc-dev 
* commit '0525c07f30f08008883cf2845afa3bf81f888c55':
  Add system API to watch for permission changes
 2015-06-11 12:53:42 +00:00
Robert Greenwalt
0c3b280af0 am ac114ae0: am c34f2f15: Merge "Add logging to help debug this issue." into mnc-dev 
* commit 'ac114ae071fac3693e4694f338f5e5612f11a730':
  Add logging to help debug this issue.
 2015-06-11 12:53:16 +00:00
Svet Ganov
5772b5c671 Propagete document meta-data to custom print UI. 
Change-Id: I3f122224e1b311a222969253ae0336177989a414
 2015-06-11 03:32:09 -07:00
Svet Ganov
e545bd36a4 Merge "Permission group is granted if one permission is granted for UI purposes." into mnc-dev 2015-06-11 08:17:43 +00:00
Svet Ganov
1ed0e553c6 Permission group is granted if one permission is granted for UI purposes. 
bug:21761217

Change-Id: I02c78225e3883106565d304d5b268e496bca7d89
 2015-06-11 01:17:07 -07:00
Chris Banes
dbdaa9b41e Merge "API council review feedback for ActionMenuView" into mnc-dev 2015-06-11 08:05:42 +00:00
Svetoslav
75a0ee081f Merge "Add system API to watch for permission changes" into mnc-dev 2015-06-11 08:02:06 +00:00
Robert Greenwalt
3d68dee119 Add logging to help debug this issue. 
Shows:
TelephonyNetworkFactories:
    {TelephonyNetworkFactory - ScoreFilter=50, Filter=[ Transports:
    CELLULAR Capabilities: MMS&SUPL&DUN&FOTA&IMS&CBS&IA&RCS&XCAP&EIMS&
    INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN Specifier: <2>],
    requests=1, refCount=0}
        {NetworkRequest [ id=1, legacyType=-1, [ Capabilities:
        INTERNET&NOT_RESTRICTED&TRUSTED&NOT_VPN] ], score=50, requested=true}

bug:20731384
Change-Id: I6a38f195609ad01ff2a2584d07945540ae421586
 2015-06-10 22:17:49 -07:00
Svetoslav
f7c06eb03a Add system API to watch for permission changes 
Change-Id: I1ce450a59fb326c14848f46732d877dea33f33c7
 2015-06-10 21:24:13 -07:00
Jeff Brown
04eeeaafb9 am 468353e3: am 3c9614a0: Merge "Expose Context.getSystemServiceName()." into mnc-dev 
* commit '468353e3229a4f3895e4ad6c09959b1d0f942e49':
  Expose Context.getSystemServiceName().
 2015-06-11 03:01:19 +00:00
Jeff Brown
e0c4fb5cfc am 26df10b9: am 5b65a36d: Merge "Add docs for ContentProviderOperations." into mnc-dev 
* commit '26df10b99716b067f451b9fe5a0a74bf6a400d41':
  Add docs for ContentProviderOperations.
 2015-06-11 03:01:13 +00:00
Robert Greenwalt
c2a3f75fb6 am 1ec7d05e: am 3cbad5c1: Merge "Remove network requests properly." into mnc-dev 
* commit '1ec7d05eec4404a14ae2838fe12352debcccea4f':
  Remove network requests properly.
 2015-06-11 02:54:29 +00:00
Jeff Brown
3c9614a03a Merge "Expose Context.getSystemServiceName()." into mnc-dev 2015-06-11 02:37:29 +00:00
Jeff Brown
5b65a36d59 Merge "Add docs for ContentProviderOperations." into mnc-dev 2015-06-11 02:32:13 +00:00
Robert Greenwalt
3cbad5c17f Merge "Remove network requests properly." into mnc-dev 2015-06-11 02:19:17 +00:00
Adam Powell
159e7a5506 am bffd6fcb: am b535c5e2: Merge "Start using some better sorting for intent resolution" into mnc-dev 
* commit 'bffd6fcb46aeb729bc650d27fb66da09d7b5df78':
  Start using some better sorting for intent resolution
 2015-06-11 01:51:49 +00:00
Jonathan Basseri
f025df1c1c am f823a7f7: am 95120bbb: Merge "Fix typo possibly -> possible." into mnc-dev 
* commit 'f823a7f7d41c5f56e638435cf59c2ebb8e05cc57':
  Fix typo possibly -> possible.
 2015-06-11 01:51:31 +00:00
Jeff Sharkey
51b055d330 am e1844c83: am 5fc24733: New strings! 
* commit 'e1844c8302c57e231b85b2fb3cb59fb7f569a270':
  New strings!
 2015-06-11 01:51:09 +00:00
Aravind Akella
b05c482122 am 1c2cf214: am 0d07846f: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 
* commit '1c2cf214eec147ca1635bdfd4d837e1293b73003':
  Use LOCATION_HARDWARE permission for data injection.
 2015-06-11 01:50:13 +00:00
Zhijun He
61cc1ee35a am cee46cfe: am 1527edbc: Merge "Camera2: fix high speed output surface format check" into mnc-dev 
* commit 'cee46cfe16f786e852708df717847d3ecc41a195':
  Camera2: fix high speed output surface format check
 2015-06-11 01:50:07 +00:00
Raph Levien
9f7b20083a am 3354ac51: am a011c7fc: Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 
* commit '3354ac51fce160274680ecb4e9af0d7e9cf3977e':
  Fix documentation of nextSpanTransition off by one
 2015-06-11 01:49:56 +00:00
Adam Powell
b535c5e28a Merge "Start using some better sorting for intent resolution" into mnc-dev 2015-06-11 01:16:57 +00:00
Jeff Brown
40f58d910a Expose Context.getSystemServiceName(). 
Expose this method so that subclasses can declare new types of services
that can be returned by getSystemService(Class<T>).

Bug: 21343770
Change-Id: I08bdfa61153d19298645dc495deb2d535e54f9f0
 2015-06-10 17:47:52 -07:00
Jonathan Basseri
95120bbb6f Merge "Fix typo possibly -> possible." into mnc-dev 2015-06-11 00:44:46 +00:00
Jeff Brown
764e95ec4f Add docs for ContentProviderOperations. 
Bug: 21343769
Change-Id: Ia122b58785cf98f16664f82eb00a1f6bd9366885
 2015-06-10 17:39:29 -07:00
Jeff Sharkey
5fc247338d New strings! 
Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If1c5882d48f798d311f6d2b86277d3c13f06824e
 2015-06-10 16:49:11 -07:00
Adam Powell
d25267c0d8 Start using some better sorting for intent resolution 
Previously we used time in foreground as our sole signal. Now, also
use time since last launch and launch count as signals.

Still to come later: launch count based on specific component name
rather than package, pending the recording of that information in
usage stats.

Change-Id: Ic449cae396cfee797b7bb3de9dc3c0da5da2f96c
 2015-06-10 16:37:32 -07:00
Vladislav Kaznacheev
99eae97826 am 093aba01: am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev 
* commit '093aba013fd56b56f272940e268dee2070b9173f':
  Make VPA.setInterpolator(null) unset the interpolator.
 2015-06-10 23:17:42 +00:00
Alan Viverette
a32fdbda33 am 7654bffd: am 2964c7b8: Merge "Update seek bar dialog preference for Material" into mnc-dev 
* commit '7654bffd6a4015e3ad41340607b71b50e746825f':
  Update seek bar dialog preference for Material
 2015-06-10 23:16:46 +00:00
Jun Mukai
f3de280367 am ea26da24: am b3aa575e: Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev 
* commit 'ea26da244efe4757ec01fc30980d6f1c5047bffa':
  Specifies the new height/width for update() on ListPopupWindow.show().
 2015-06-10 23:16:16 +00:00
Nick Kralevich
a5a14350d0 am 6d215c30: am 5ac4a5fa: Merge "Fix USB access control when adb is disabled." into mnc-dev 
* commit '6d215c300ffccd2ab5b4e4403d67c40cbd64c01a':
  Fix USB access control when adb is disabled.
 2015-06-10 23:16:08 +00:00
Adam Lesinski
5b02907c97 am 9702b5d9: am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 
* commit '9702b5d98824df4fafce821ce9fe15907586b9b1':
  Add more blaming output to batterystats dumpsys
 2015-06-10 23:15:25 +00:00
Jason Monk
4ef0beb6ae am 5bda8f4e: am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev 
* commit '5bda8f4e2436582e17307f35326376db7cb28657':
  Add action for reaching ignore battery optimizations
 2015-06-10 23:15:19 +00:00
Robin Lee
d5c99db459 am 347836e9: am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 
* commit '347836e965dd5c88b1a679d27e7a66f6858a7e3e':
  Policy: make bulk CA uninstalls happen in service
 2015-06-10 23:15:04 +00:00
Jeff Brown
a748bfbd6e am 9749e335: am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev 
* commit '9749e33579a3d27144ac39d9e3572ed30e234039':
  Support 4K overlay displays.
 2015-06-10 23:14:36 +00:00
Abodunrinwa Toki
034e5cfca4 am cf068ba2: am 3ae8bf53: Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev 
* commit 'cf068ba27d86289ed085da17a0536a4d3a5208e6':
  Change FloatingToolbar entry/exit animations to fadeIn/fadeOut.
 2015-06-10 23:14:21 +00:00
Ben Kwa
3aff4fc621 am e04b20dd: am c783a5e7: Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 
* commit 'e04b20dd763a212596a3a77ca342fe4fb33e2939':
  Enable apps to exclude their own roots from the DocumentsUI roots list.
 2015-06-10 23:13:30 +00:00
John Spurlock
96d4a9ec39 Volume: Disable seekbar prefs when zen muted. 
- And display the last audible value.

Bug: 21267436
Change-Id: I667d0680811b48a51eab22c837933e493f1d5c44
 2015-06-10 19:04:40 -04:00
Aravind Akella
0d07846f0f Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 2015-06-10 22:56:33 +00:00
Zhijun He
1527edbcf9 Merge "Camera2: fix high speed output surface format check" into mnc-dev 2015-06-10 22:56:22 +00:00
Raph Levien
a011c7fcf7 Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev 2015-06-10 22:52:33 +00:00
Aravind Akella
1b41cc9567 Use LOCATION_HARDWARE permission for data injection. 
Change-Id: I59c1e1e97a6a0457f6fc2984b214647814895cf2
 2015-06-10 15:21:03 -07:00
Raph Levien
7d627eb9d2 Fix documentation of nextSpanTransition off by one 
Improve wording of javadoc for nextSpanTransition() to accurately
reflect the actual implementation.

Bug: 19274845
Change-Id: I8f8fb6a21a8cbcc26fefb63164a6943431d16089
 2015-06-10 15:19:50 -07:00