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

153359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
c628f6a965 am 0324d77a: am 4c06e89b: am 4f17dc02: Merge "Update date and time picker styling" into lmp-dev 
* commit '0324d77a8f1e5412e8f59db81863927359aa493f':
  Update date and time picker styling
 2014-08-26 23:21:08 +00:00
vandwalle
f6fda0ba55 am fdec664f: am 52b4b430: am 0ad85ac7: Merge "remove call to passpoint service start" into lmp-dev 
* commit 'fdec664ff23e5d39c4926d193f62f415c0dccd58':
  remove call to passpoint service start
 2014-08-26 23:20:57 +00:00
Alan Viverette
7b5bf2f10b am 4c06e89b: am 4f17dc02: Merge "Update date and time picker styling" into lmp-dev 
* commit '4c06e89b3c661ebb3451ff64c293b823e8c655b7':
  Update date and time picker styling
 2014-08-26 23:10:02 +00:00
vandwalle
73d136c9c5 am 52b4b430: am 0ad85ac7: Merge "remove call to passpoint service start" into lmp-dev 
* commit '52b4b43066cd7483ed9a52c5d059d48492b578b6':
  remove call to passpoint service start
 2014-08-26 23:09:53 +00:00
Alan Viverette
819b7d5de2 am 4f17dc02: Merge "Update date and time picker styling" into lmp-dev 
* commit '4f17dc029fcc7c4c77c97a2251c3ee646f4bbf85':
  Update date and time picker styling
 2014-08-26 22:59:19 +00:00
vandwalle
a0974b0e20 am 0ad85ac7: Merge "remove call to passpoint service start" into lmp-dev 
* commit '0ad85ac7af74b961c3de7d33c2fd597c0f8cd2ac':
  remove call to passpoint service start
 2014-08-26 22:59:14 +00:00
Joe Fernandez
784ea60b3f am 1604988b: am 7dcc37a7: am 8b4d6f9d: am f589d63a: am 17b94b8a: am 2e8d4787: docs: link bug fixes for accessibility testing page 
* commit '1604988b7c46ae4243983157349473aa37f59225':
  docs: link bug fixes for accessibility testing page
 2014-08-26 22:55:36 +00:00
Alan Viverette
03740d74ca Merge "Update date and time picker styling" into lmp-dev 2014-08-26 22:51:50 +00:00
vandwalle
780617faa2 Merge "remove call to passpoint service start" into lmp-dev 2014-08-26 22:47:47 +00:00
vandwalle
0bbd2aaace remove call to passpoint service start 
Change-Id: Ibc6e537544c2228e8b07f734158182d1e4817d17
 2014-08-26 15:43:46 -07:00
Joe Fernandez
9495267178 am 7dcc37a7: am 8b4d6f9d: am f589d63a: am 17b94b8a: am 2e8d4787: docs: link bug fixes for accessibility testing page 
* commit '7dcc37a795f21553dc317e3454bdd402250833a3':
  docs: link bug fixes for accessibility testing page
 2014-08-26 22:42:09 +00:00
Christoph Studer
ab05117993 am 34c027b4: am 26a0be5d: am 6011b66d: Merge "NoMan: Fix inconsistent notification comparator" into lmp-dev 
* commit '34c027b4f41b2eb90243395fd79d2550a09a31a3':
  NoMan: Fix inconsistent notification comparator
 2014-08-26 22:34:40 +00:00
Jim Miller
23cfead9e6 am f5b9dacd: am ed18d240: am fc5346ed: Merge "Hide fingerprint API until new API is ready" into lmp-dev 
* commit 'f5b9dacd48d29877a1c92414fd4d2973e3db6837':
  Hide fingerprint API until new API is ready
 2014-08-26 22:34:34 +00:00
Joe Fernandez
a2c07b6e58 am 8b4d6f9d: am f589d63a: am 17b94b8a: am 2e8d4787: docs: link bug fixes for accessibility testing page 
* commit '8b4d6f9d0bd1a67642e7d889f4b81ade97139fda':
  docs: link bug fixes for accessibility testing page
 2014-08-26 22:30:17 +00:00
Chris Craik
0a812d7ec7 am 33ad227c: am f3934d0c: am bfb8310a: Merge "Notify VM of native pixelref allocations" into lmp-dev 
* commit '33ad227c602872e8cb9b05d2d4a9ee794baac18f':
  Notify VM of native pixelref allocations
 2014-08-26 22:25:29 +00:00
Christoph Studer
b098d05850 am 26a0be5d: am 6011b66d: Merge "NoMan: Fix inconsistent notification comparator" into lmp-dev 
* commit '26a0be5d2156f401c45745ae771fec5b1942df42':
  NoMan: Fix inconsistent notification comparator
 2014-08-26 22:23:17 +00:00
Jim Miller
7364f8d54e am ed18d240: am fc5346ed: Merge "Hide fingerprint API until new API is ready" into lmp-dev 
* commit 'ed18d240c9e565806beed2fc8701d3eb2c5cf8cd':
  Hide fingerprint API until new API is ready
 2014-08-26 22:23:12 +00:00
Joe Fernandez
987eb97344 am f589d63a: am 17b94b8a: am 2e8d4787: docs: link bug fixes for accessibility testing page 
* commit 'f589d63a14e14925253eaf77ca3aa5bd495a015a':
  docs: link bug fixes for accessibility testing page
 2014-08-26 22:19:02 +00:00
Jeff Sharkey
c56405822c am 70b6d65b: am 232aac5c: am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '70b6d65beac2e33e96e0f1487316f4d7119168ac':
  Report FileBridge failures as wtf().
 2014-08-26 22:16:41 +00:00
vandwalle
24002ca2a2 am b9e8cf3b: (-s ours) am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit 'b9e8cf3b5fc47f31921e7df168983fb5f9c031c3':
  remove passpoint - DO NOT MERGE
 2014-08-26 22:16:37 +00:00
Christoph Studer
c7c01b798d am bc366c0c: am b3326cdc: am fc00943b: Merge "NoMan: Cancel children when update removes summary" into lmp-dev 
* commit 'bc366c0cd6a08f0d75cd68a2a0905edace3d84d8':
  NoMan: Cancel children when update removes summary
 2014-08-26 22:16:32 +00:00
Christoph Studer
37b84639a2 am d4b0a4b1: am deefd534: am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit 'd4b0a4b1641031fc3d2e74beecee4eccea46d1ae':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 22:16:27 +00:00
Christoph Studer
469e5c127a am 46a63c20: am 48308602: am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit '46a63c20759747e0aef2b76d3a378013f6084d04':
  Notification: Optimize L icon processing
 2014-08-26 22:16:22 +00:00
Christoph Studer
2ad0d04b82 am e4bd989d: am d61d9a04: am 15c6ad7b: Merge "SysUI: Uprank current media notification" into lmp-dev 
* commit 'e4bd989d35f71ebebacfdf18325554798558b676':
  SysUI: Uprank current media notification
 2014-08-26 22:16:17 +00:00
Christoph Studer
c5eed12688 am 6011b66d: Merge "NoMan: Fix inconsistent notification comparator" into lmp-dev 
* commit '6011b66d490f014936e24d2ca56b1c9f38ad8828':
  NoMan: Fix inconsistent notification comparator
 2014-08-26 22:12:14 +00:00
Jim Miller
67d7e94b29 am fc5346ed: Merge "Hide fingerprint API until new API is ready" into lmp-dev 
* commit 'fc5346ed168e2729783b25e869a910483b7b0628':
  Hide fingerprint API until new API is ready
 2014-08-26 22:12:10 +00:00
Chris Craik
bfc4524e5e am f3934d0c: am bfb8310a: Merge "Notify VM of native pixelref allocations" into lmp-dev 
* commit 'f3934d0c2de9324bb4d0428767a096248aa161da':
  Notify VM of native pixelref allocations
 2014-08-26 22:11:54 +00:00
Christoph Studer
330459d685 Merge "NoMan: Fix inconsistent notification comparator" into lmp-dev 2014-08-26 22:03:07 +00:00
Jim Miller
e7b6b1aae7 Merge "Hide fingerprint API until new API is ready" into lmp-dev 2014-08-26 22:02:52 +00:00
Jay Shrauner
4375297ca9 am 566462cb: am 69f81c5a: am 667e1f9a: Merge "Fix NPE when have no phone accounts" into lmp-dev 
* commit '566462cb84a172ff784471c6f77a947bb1d6862a':
  Fix NPE when have no phone accounts
 2014-08-26 22:02:03 +00:00
Baligh Uddin
6ab680088d am 6a005513: (-s ours) am da59441d: (-s ours) am 4e0f22cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6a005513d1a039eba89fe1902e2af8372e7be4c2':
  Import translations. DO NOT MERGE
 2014-08-26 22:01:59 +00:00
Baligh Uddin
dd5919349b am ffdc6fcd: (-s ours) am ff1c95c1: (-s ours) am 79878df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ffdc6fcddfd4012becd99a1fcbc1a4343fd487e9':
  Import translations. DO NOT MERGE
 2014-08-26 22:01:54 +00:00
Jeff Sharkey
971c5910e7 am 232aac5c: am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '232aac5cc0313a94ce3c96bd0f3a13e0b70c9a36':
  Report FileBridge failures as wtf().
 2014-08-26 22:01:00 +00:00
vandwalle
fb9cf903fb am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit '39b53f3c10e1e758c2bcc27ffd9f4c1076d13539':
  remove passpoint - DO NOT MERGE
 2014-08-26 22:00:54 +00:00
Christoph Studer
0a2980b83a am b3326cdc: am fc00943b: Merge "NoMan: Cancel children when update removes summary" into lmp-dev 
* commit 'b3326cdcecd593fa1b2cd4ce117a86d46927b309':
  NoMan: Cancel children when update removes summary
 2014-08-26 22:00:44 +00:00
Christoph Studer
b3196d3327 am deefd534: am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit 'deefd53448758914da3c943e0cff751fc5f783fc':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 22:00:25 +00:00
Christoph Studer
ad486ef172 am 48308602: am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit '483086029fe7556903e0b4131c6fedf9f8690fa5':
  Notification: Optimize L icon processing
 2014-08-26 22:00:14 +00:00
Christoph Studer
f39747718b am d61d9a04: am 15c6ad7b: Merge "SysUI: Uprank current media notification" into lmp-dev 
* commit 'd61d9a04458008ba11d0ae7a50126e7c711961f0':
  SysUI: Uprank current media notification
 2014-08-26 22:00:09 +00:00
Chris Craik
8750c37d84 am bfb8310a: Merge "Notify VM of native pixelref allocations" into lmp-dev 
* commit 'bfb8310ab2214c19e955121373217edfe7258ebd':
  Notify VM of native pixelref allocations
 2014-08-26 21:59:27 +00:00
Christoph Studer
cd4adf8b5e NoMan: Fix inconsistent notification comparator 
Switch second phase of notification sorting to lexicographic
string comparison in order to enforce a consistent comparison.

Note that this slightly changes the logic: Within groups we
previously fell back on authoritative rank comparison when
one of the notificiations didn't have a sort key. Now we
just replace missing sort keys with " ".

Bug: 16626175
Change-Id: I91f4f4afeeb2c8edda6cd2668011a7367795086c
 2014-08-26 23:56:27 +02:00
Jay Shrauner
87677d63a1 am 69f81c5a: am 667e1f9a: Merge "Fix NPE when have no phone accounts" into lmp-dev 
* commit '69f81c5ae61724a6fedb4b18081aa1517dcf34e3':
  Fix NPE when have no phone accounts
 2014-08-26 21:51:12 +00:00
Baligh Uddin
b59d2624f0 am da59441d: (-s ours) am 4e0f22cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'da59441d4d7396508ff958e61446cee08ef4dd3a':
  Import translations. DO NOT MERGE
 2014-08-26 21:51:07 +00:00
Baligh Uddin
b31378cb23 am ff1c95c1: (-s ours) am 79878df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ff1c95c15612a500026a7d77eb5b924e2e03cdf1':
  Import translations. DO NOT MERGE
 2014-08-26 21:51:03 +00:00
Jeff Sharkey
7b13ce85bd am 64c53500: Merge "Report FileBridge failures as wtf()." into lmp-dev 
* commit '64c535003d257acf781efa3d0b08d463a5f38e82':
  Report FileBridge failures as wtf().
 2014-08-26 21:50:16 +00:00
vandwalle
c59ecafa85 am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit 'bdc65df3860cf5f4aae9c79ad14f035626689bfa':
  remove passpoint - DO NOT MERGE
 2014-08-26 21:50:02 +00:00
Christoph Studer
6b6c6aa2e2 am fc00943b: Merge "NoMan: Cancel children when update removes summary" into lmp-dev 
* commit 'fc00943b1addb1f6e1ded0476db4669615cce7c5':
  NoMan: Cancel children when update removes summary
 2014-08-26 21:49:57 +00:00
Christoph Studer
1fa2947df7 am 7e637d1e: Merge "NoListener: meetsInterruptionFilter -> matchesInterruptionFilter" into lmp-dev 
* commit '7e637d1e94badfe06f99abfc81b03c974f557ee5':
  NoListener: meetsInterruptionFilter -> matchesInterruptionFilter
 2014-08-26 21:49:51 +00:00
Christoph Studer
acecce7921 am e25ac583: Merge "Notification: Optimize L icon processing" into lmp-dev 
* commit 'e25ac583c0016616cfa145734816675e26354d32':
  Notification: Optimize L icon processing
 2014-08-26 21:49:39 +00:00
Christoph Studer
54ebef6da8 am 15c6ad7b: Merge "SysUI: Uprank current media notification" into lmp-dev 
* commit '15c6ad7bc58ba3a9e88cfdbd1a8b31053986fca9':
  SysUI: Uprank current media notification
 2014-08-26 21:49:34 +00:00
Chris Craik
b34eeb70a6 Merge "Notify VM of native pixelref allocations" into lmp-dev 2014-08-26 21:47:46 +00:00