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

211428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
61a5abcf96 am d5b3a35c: am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'd5b3a35c14130deba54d9e72a10cce16adf7b99b':
  Fix touch-to-wake while dozing
 2015-08-13 03:18:25 +00:00
Jorim Jaggi
7b867f6173 Merge "Merge commit '80581f7a' into master" 2015-08-13 03:15:45 +00:00
Jorim Jaggi
559b8c5f4e Merge commit '80581f7a' into master 
Change-Id: Ifd8f9c7a854901e0a48bc8a611cfb002fa37298c
 2015-08-12 20:09:52 -07:00
Roozbeh Pournader
5e9ed365ad Support strikethrough text in Html.fromHtml(). 
All the three tags, <del>, <s>, and <strike> are now converted to
strikethrough text.

Bug: 21025743
Change-Id: I62dc9793223e266f6e2181169766fde8be0e2aa7
 2015-08-12 19:34:47 -07:00
Dianne Hackborn
d38e7c9387 am 1dd2f5a3: am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '1dd2f5a3ebd4768ebc8bf4c08c7f62c8c1300c7f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 02:10:15 +00:00
Jorim Jaggi
d5b3a35c14 am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit '5f3af1449aa9a86768f7768c14eaeba927733c91':
  Fix touch-to-wake while dozing
 2015-08-13 01:18:24 +00:00
Jorim Jaggi
80581f7a65 am deb6a3ac: am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit 'deb6a3acbdbf81a995cc3c1eb2475b041564d44d':
  Require strong authentication after a timeout
 2015-08-13 01:18:18 +00:00
Dianne Hackborn
1dd2f5a3eb am 40bc2066: am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '40bc20660d3dc65f66e4409893f1ba6bf729d97f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:18:13 +00:00
Andreas Gampe
56e6377618 am ea30eb29: Hwui: Remove unused variables 
* commit 'ea30eb29f87618de673e8b069b1a545749edf076':
  Hwui: Remove unused variables
 2015-08-13 01:11:09 +00:00
Jorim Jaggi
5f3af1449a am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'd59f5c02810095bba4bc7a47f9169655d4be7521':
  Fix touch-to-wake while dozing
 2015-08-13 01:09:26 +00:00
Jorim Jaggi
deb6a3acbd am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit '73d9e1ce0bc8e4478b165fd5f550c99830fbcb57':
  Require strong authentication after a timeout
 2015-08-13 01:09:21 +00:00
Dianne Hackborn
40bc20660d am a54d4583: am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'a54d4583ec4d6b112a99c29ef71fbabfd67478cb':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:09:15 +00:00
Andreas Gampe
ea30eb29f8 Hwui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512

(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)

Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
 2015-08-12 18:05:35 -07:00
Jorim Jaggi
d59f5c0281 am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 
* commit 'a78181b6a88d4ce32bb2b1f01e03b9b048dbaf54':
  Fix touch-to-wake while dozing
 2015-08-13 01:02:35 +00:00
Jorim Jaggi
73d9e1ce0b am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit '69082a298f50680128ada89a8bef777f0fadf829':
  Require strong authentication after a timeout
 2015-08-13 01:02:31 +00:00
Dianne Hackborn
a54d4583ec am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '9512a857454d761b53f46958733ba23216c41e64':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:02:26 +00:00
Jorim Jaggi
a78181b6a8 Merge "Fix touch-to-wake while dozing" into mnc-dr-dev 2015-08-13 00:56:14 +00:00
Jorim Jaggi
69082a298f Merge "Require strong authentication after a timeout" into mnc-dr-dev 2015-08-13 00:56:04 +00:00
Dianne Hackborn
9512a85745 am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:54:35 +00:00
Dianne Hackborn
ff9912d594 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:59 +00:00
Nick Kralevich
f6f98daf54 am ebdc7caa: am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit 'ebdc7caac07f35802e1d3635fe55c98983774d49':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-13 00:46:29 +00:00
Nick Kralevich
ebdc7caac0 am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit 'f3ae260367235e325adce10c9aadddfe8a3107c1':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-13 00:40:25 +00:00
Jeff Sharkey
7619dba79e am 59a18530: am b4ac3781: am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit '59a18530f5fc0152b7a7609bd2ed2128fa8e7fc7':
  Update ifaces when global restriction changes.
 2015-08-13 00:33:35 +00:00
Jeff Sharkey
59a18530f5 am b4ac3781: am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'b4ac37818efa6ea81902f8b2631260b5b1b0ce78':
  Update ifaces when global restriction changes.
 2015-08-13 00:27:23 +00:00
Deepanshu Gupta
8d38e7c905 Merge "Add StyleableRes annotation to TypedArray." 2015-08-13 00:25:54 +00:00
Jeff Sharkey
b4ac37818e am d913d78a: am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'd913d78a331de5e488b27810d8dd18399f50de48':
  Update ifaces when global restriction changes.
 2015-08-13 00:19:46 +00:00
Jeff Sharkey
d913d78a33 am ea68c4ce: am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'ea68c4ceacbe235c4d8688437010d855ef02e1fb':
  Update ifaces when global restriction changes.
 2015-08-13 00:11:49 +00:00
Jeff Sharkey
ea68c4ceac am c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev 
* commit 'c97509c0292910d7fb27e4c890ad4bc0ea723fec':
  Update ifaces when global restriction changes.
 2015-08-13 00:00:13 +00:00
Nick Kralevich
f3ae260367 am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 
* commit '10e0f07975e6e446763b733bb438df5715c3693d':
  SELinuxPolicyInstallReceiver:  Switch to file_contexts.bin.
 2015-08-12 23:57:58 +00:00
Roshan Pius
474ee117e8 am c01093cc: am b40108fb: am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit 'c01093cc9b414f90b2f400cd196d631b38bd6d0f':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:56:29 +00:00
Elliott Hughes
4c807349bd am 344d347a: am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '344d347af22705aa2fa80602d27a5682a72b5f69':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:56:18 +00:00
Jeff Sharkey
c97509c029 Merge "Update ifaces when global restriction changes." into mnc-dev 2015-08-12 23:51:55 +00:00
Nick Kralevich
10e0f07975 Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." 2015-08-12 23:46:28 +00:00
Jeff Sharkey
9d14206594 Update ifaces when global restriction changes. 
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces.  In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.

This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.

Bug: 23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
 2015-08-12 16:46:05 -07:00
Jorim Jaggi
aabab27028 Fix touch-to-wake while dozing 
Bug: 23113439
Change-Id: I7abcf1b4298fc832ba78df742c691246766993b1
 2015-08-12 16:45:34 -07:00
Jorim Jaggi
25b4d4b280 Require strong authentication after a timeout 
Bug: 21594472
Change-Id: Iab169d4fa2e4ad134f8c8579654b28e96b5b1385
 2015-08-12 16:39:56 -07:00
Roshan Pius
c01093cc9b am b40108fb: am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit 'b40108fb85fc11f636424ebf9154bdfbc56764a0':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:36:14 +00:00
Elliott Hughes
344d347af2 am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 23:28:30 +00:00
Roshan Pius
b40108fb85 am 289ecbbf: am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit '289ecbbfafbb73ccf00e14ea8e2f6584406b50fe':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:25:22 +00:00
Roshan Pius
289ecbbfaf am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 
* commit '737aed41ca9d8bad425ed8223fa4e4c84c7b102c':
  Add a new carrier config for DTMF tone gap.
 2015-08-12 23:17:27 +00:00
Roshan Pius
737aed41ca Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev 2015-08-12 23:12:24 +00:00
Dianne Hackborn
c3f7449517 Fix issue #23116383: Include security patch level in Settings 
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
 2015-08-12 16:10:58 -07:00
Elliott Hughes
39669d7f6b am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 
* commit '6fdc633380bb4744595575449101ee171b690175':
  Lose HAVE_ANDROID_OS from frameworks/base.
 2015-08-12 22:31:01 +00:00
Elliott Hughes
6fdc633380 Merge "Lose HAVE_ANDROID_OS from frameworks/base." 2015-08-12 22:21:46 +00:00
Elliott Hughes
ba3fe56edc Lose HAVE_ANDROID_OS from frameworks/base. 
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
 2015-08-12 14:49:53 -07:00
Raph Levien
8cf6d865cf am d202d15d: am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'd202d15d9e4845537c4409c9880eb269b2b59129':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:40:58 +00:00
Raph Levien
d202d15d9e am cf2d44be: am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'cf2d44bee50dc2950181bbf5974c32eacea6f0a7':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:31:07 +00:00
Raph Levien
cf2d44bee5 am 855a862f: am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit '855a862f6d1ef1af1b16c21d67645b5141db94fc':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:22:46 +00:00
Raph Levien
855a862f6d am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'c98a786c693bf0bb617348e858ffe720db4d96d8':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:13:32 +00:00
Raph Levien
c98a786c69 am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev 
* commit 'beabcb92cbdec6f68bd712c9972e6f8377b78f46':
  Fix Insertion ActionMode not showing on RTL languages
 2015-08-12 21:07:43 +00:00