Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,091 Commits 3 Branches 0 Tags
4ba9752c33559db2124eeb48ad659bb4b23e3032
Commit Graph

208091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raph Levien
4ba9752c33 am bf375cd4: am 04531d5c: am f03c090f: am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev 
* commit 'bf375cd4eff331830acbc7accf84c78057036ff0':
  Truncate and ellipsize app name if too long for dialog.
 2015-08-26 00:04:50 +00:00
Raph Levien
bf375cd4ef am 04531d5c: am f03c090f: am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev 
* commit '04531d5cfc83a6f77ab33479f7ab99d4164282a1':
  Truncate and ellipsize app name if too long for dialog.
 2015-08-25 23:52:46 +00:00
Raph Levien
04531d5cfc am f03c090f: am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev 
* commit 'f03c090f3e41a80282e4febd85ca53c681649f86':
  Truncate and ellipsize app name if too long for dialog.
 2015-08-25 23:43:54 +00:00
Jim Miller
aeaf4229ed am a1cc3806: am 919a3fdf: am 01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev 
* commit 'a1cc3806067d8644355e8508ac7c9c930e12339e':
  Handle driver errors from remove, enroll and auth.
 2015-08-25 23:43:25 +00:00
Jim Miller
a1cc380606 am 919a3fdf: am 01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev 
* commit '919a3fdf9c92aa232f6304c32227cf0fe99cb8f3':
  Handle driver errors from remove, enroll and auth.
 2015-08-25 23:36:30 +00:00
Raph Levien
f03c090f3e am 8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev 
* commit '8304c6c0f9d4b8624ab9cf5cfe5dce15db64c4de':
  Truncate and ellipsize app name if too long for dialog.
 2015-08-25 23:35:37 +00:00
Jim Miller
919a3fdf9c am 01c5bf54: Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev 
* commit '01c5bf5470a8c1c75f74792d8be1dada3a6f7b8a':
  Handle driver errors from remove, enroll and auth.
 2015-08-25 23:29:40 +00:00
Raph Levien
8304c6c0f9 Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev 2015-08-25 23:25:10 +00:00
Jim Miller
01c5bf5470 Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev 2015-08-25 23:22:29 +00:00
Jorim Jaggi
b98adf20a0 am bdb151ea: am 4816d7d5: am e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev 
* commit 'bdb151ea646dbe4f39e640e1ae7b25cbd8495a08':
  Disable RT animations for header ripple
 2015-08-25 23:19:25 +00:00
Jorim Jaggi
bdb151ea64 am 4816d7d5: am e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev 
* commit '4816d7d58c7717a5a89c75fee17ce6202c7b1bea':
  Disable RT animations for header ripple
 2015-08-25 23:09:59 +00:00
Jorim Jaggi
4816d7d58c am e30e8980: Merge "Disable RT animations for header ripple" into mnc-dr-dev 
* commit 'e30e8980a1ceeacdc7ecafd36a622cc93d7ab3fc':
  Disable RT animations for header ripple
 2015-08-25 23:02:24 +00:00
Jorim Jaggi
e30e8980a1 Merge "Disable RT animations for header ripple" into mnc-dr-dev 2015-08-25 22:54:34 +00:00
Michael Wright
58950a9476 Truncate and ellipsize app name if too long for dialog. 
If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584
 2015-08-25 23:12:34 +01:00
Zach Johnson
fe12a31cbc am df98fdaf: am 5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev 
* commit 'df98fdaf2c6165dcd8bfb2ba8fd3e89d729af256':
  Fix AudioAttributes.usageToString() string return values
 2015-08-25 19:32:23 +00:00
Zach Johnson
3f7cfb2cfb am 632c240f: am 3f62358b: Merge "*ring ring* Who is it? Destiny? I\'ve been expecting your call..." into cw-e-dev 
* commit '632c240f436f03d6412640376ad96e436ff5f901':
  *ring ring* Who is it? Destiny? I've been expecting your call...
 2015-08-25 19:32:18 +00:00
Zach Johnson
df98fdaf2c am 5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev 
* commit '5d636c8c50cc4a26492095b3df61801f3935424f':
  Fix AudioAttributes.usageToString() string return values
 2015-08-25 19:22:16 +00:00
Zach Johnson
632c240f43 am 3f62358b: Merge "*ring ring* Who is it? Destiny? I\'ve been expecting your call..." into cw-e-dev 
* commit '3f62358b7e3a35f6f9c68aac09889e5d47bc6d2a':
  *ring ring* Who is it? Destiny? I've been expecting your call...
 2015-08-25 19:22:11 +00:00
Zach Johnson
5d636c8c50 Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev 2015-08-25 19:16:59 +00:00
Zach Johnson
3f62358b7e Merge "*ring ring* Who is it? Destiny? I've been expecting your call..." into cw-e-dev 2015-08-25 19:16:43 +00:00
Wei Liu
6142828872 am 8a6f55e7: am 30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib. 
* commit '8a6f55e743973cf351126cf540c6021aba39b9ba':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
 2015-08-25 18:37:45 +00:00
Wei Liu
8a6f55e743 am 30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib. 
* commit '30275c1924b2bd45b05bd9c98f8648ecbc71374f':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
 2015-08-25 18:32:47 +00:00
Zach Johnson
fe8b2477d2 Fix AudioAttributes.usageToString() string return values 
Change-Id: I75642d043d647c921259dad20df504dd2e551644
 2015-08-25 11:30:51 -07:00
Zach Johnson
f1b48144a9 *ring ring* Who is it? Destiny? I've been expecting your call... 
https://www.youtube.com/watch?v=7VFPtY7hiGw

Allow USAGE_NOTIFICATION_RINGTONE regardless of effect supression
component, because otherwise we can't use the system implementation of
ringtones (audio or vibration). If a platform wishes to turn supress this,
it can be disabled through the default zen configuration if necessary.

Change-Id: I02a89376b40c6eecde2468c93898b4a821315e64
 2015-08-25 11:30:51 -07:00
Wei Liu
1148d54f08 am 608cf688: am 37e1db23: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev 
* commit '608cf688f404036ac86613e7dd6b0f73b5f12a05':
  Move SummaryForAllUidLoader to SettingsLib.
 2015-08-25 18:16:36 +00:00
Wei Liu
608cf688f4 am 37e1db23: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev 
* commit '37e1db2320acd850e0738f3972d3ba4334f59949':
  Move SummaryForAllUidLoader to SettingsLib.
 2015-08-25 18:07:17 +00:00
Nicolas Prevot
ee02b88183 am 6fbf2724: am ae2880a6: am 26b555d4: am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo. 
* commit '6fbf2724c2caf4c6dd6c8275b1005a6bf39f2897':
  Don't set a null filter to a cross-profile ResolveInfo.
 2015-08-25 18:05:11 +00:00
Wei Liu
30275c1924 Refactor UidDetailProvider and its dependencies to SettingsLib. 
so that it can be reused by Wear app data usage.

Change-Id: Ifd5709647ba031bb38b2293c35def01bcdee1448
 2015-08-25 11:01:36 -07:00
Nicolas Prevot
6fbf2724c2 am ae2880a6: am 26b555d4: am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo. 
* commit 'ae2880a62881b08eb692978a869a226fcc692c78':
  Don't set a null filter to a cross-profile ResolveInfo.
 2015-08-25 17:57:28 +00:00
Wei Liu
37e1db2320 Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev 2015-08-25 17:55:32 +00:00
Nicolas Prevot
ae2880a628 am 26b555d4: am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo. 
* commit '26b555d42ce2cf78d42ebcc9806447bf83df9318':
  Don't set a null filter to a cross-profile ResolveInfo.
 2015-08-25 17:49:18 +00:00
Nicolas Prevot
26b555d42c am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo. 
* commit 'd34ecae444867b78be06bb5a6b0fb2a66c2e30aa':
  Don't set a null filter to a cross-profile ResolveInfo.
 2015-08-25 17:39:24 +00:00
Chris Wren
9d758fb042 am b50d5b4c: am d267c3b3: am 83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev 
* commit 'b50d5b4cd419bddcdf5559db50298486b0611e9f':
  instrument fingerprint crypto token service
 2015-08-25 14:27:22 +00:00
Chris Wren
b50d5b4cd4 am d267c3b3: am 83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev 
* commit 'd267c3b3212f804a1507947f98233230af9413b4':
  instrument fingerprint crypto token service
 2015-08-25 14:22:24 +00:00
Chris Wren
d267c3b321 am 83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev 
* commit '83d83194c3e68740593800ee2c295247d2bf2e06':
  instrument fingerprint crypto token service
 2015-08-25 14:14:41 +00:00
Chris Wren
83d83194c3 Merge "instrument fingerprint crypto token service" into mnc-dr-dev 2015-08-25 14:10:20 +00:00
Nicolas Prevot
d34ecae444 Don't set a null filter to a cross-profile ResolveInfo. 
ResolverActivity expects the filter not to be null.

BUG:23395395
Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e
 2015-08-25 13:03:37 +01:00
Erik Wolsheimer
e3e9385333 am 9bdcde8a: am 49eb98e7: add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527 
* commit '9bdcde8a83dff776644eb78e94eff9382aa81458':
  add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527
 2015-08-25 05:29:57 +00:00
Erik Wolsheimer
9bdcde8a83 am 49eb98e7: add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527 
* commit '49eb98e783e2f8e8e5fe2db4844babdc31553be6':
  add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527
 2015-08-25 05:22:22 +00:00
Jorim Jaggi
33b20dd82d am 667691b5: am 2ef327ed: am 2cb70049: Scale notifications on lockscreen for 420 dpi devices 
* commit '667691b5120baacafa873ee45db3a37ab21d2a2c':
  Scale notifications on lockscreen for 420 dpi devices
 2015-08-25 05:18:19 +00:00
Erik Wolsheimer
49eb98e783 add permissions strings that have to be altered from framework originals for use in Wear 
BUG: 23223527

Change-Id: I5c175f3867d72e1dd1a539bec454ac60d2d501d7
 2015-08-24 22:14:50 -07:00
Jorim Jaggi
667691b512 am 2ef327ed: am 2cb70049: Scale notifications on lockscreen for 420 dpi devices 
* commit '2ef327ede9f9b5f5da90a2d54eceee2a0e9c4406':
  Scale notifications on lockscreen for 420 dpi devices
 2015-08-25 05:13:47 +00:00
Vinod Krishnan
59ef9b0d80 am cb4c0af3: am 46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev 
* commit 'cb4c0af3423a8e5ab9caf900d7fd3ca3e362980a':
  Override Body Sensors string for watches
 2015-08-25 05:12:03 +00:00
Jorim Jaggi
2ef327ede9 am 2cb70049: Scale notifications on lockscreen for 420 dpi devices 
* commit '2cb7004928e4bb34022e3ced112c2917fc5362f9':
  Scale notifications on lockscreen for 420 dpi devices
 2015-08-25 05:07:12 +00:00
Vinod Krishnan
cb4c0af342 am 46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev 
* commit '46814fbfc842d80033f4b1a8ae702f25eb8fd5d2':
  Override Body Sensors string for watches
 2015-08-25 05:03:03 +00:00
Jorim Jaggi
2cb7004928 Scale notifications on lockscreen for 420 dpi devices 
Bug: 23299488
Change-Id: Ied4505532aad41a3a1469efce2464a491661fb6c
 2015-08-25 04:56:43 +00:00
Vinod Krishnan
46814fbfc8 Merge "Override Body Sensors string for watches" into cw-e-dev 2015-08-25 04:51:05 +00:00
Vinod Krishnan
d9698220b5 Override Body Sensors string for watches 
Change-Id: Ie967f7ae5444b9ce92a46cd30a85896814c8fd17
 2015-08-24 21:47:45 -07:00
Jaewan Kim
f9867af26a am 29b588a3: Merge "Add documentation for media router\'s palette dependency." into mnc-ub-dev 
* commit '29b588a3b738f2bcfb572fdfe541bba19374e44b':
  Add documentation for media router's palette dependency.
 2015-08-25 01:44:30 +00:00
Jaewan Kim
29b588a3b7 Merge "Add documentation for media router's palette dependency." into mnc-ub-dev 2015-08-25 01:40:11 +00:00